From e0bc910dda5e969683cf74768a7a765415b1fe50 Mon Sep 17 00:00:00 2001
From: adonohue <aran@fb.com>
Date: Fri, 11 Feb 2011 17:48:06 -0800
Subject: [PATCH] Tweak license linter to support licenses on line immediately
 after <?php

Summary:
Tweak license linter to support licenses on line immediately after <?php

Test Plan:
Corrupt an apache license and re-lint twice.

Differential Revision: 34
Reviewed By: epriestley
Reviewers: epriestley
---
 foo.bar                                                   | 0
 .../linter/apachelicense/ArcanistApacheLicenseLinter.php  | 1 +
 src/lint/linter/license/ArcanistLicenseLinter.php         | 8 ++++----
 3 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 foo.bar

diff --git a/foo.bar b/foo.bar
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/lint/linter/apachelicense/ArcanistApacheLicenseLinter.php b/src/lint/linter/apachelicense/ArcanistApacheLicenseLinter.php
index a57cd40f..d20f8575 100644
--- a/src/lint/linter/apachelicense/ArcanistApacheLicenseLinter.php
+++ b/src/lint/linter/apachelicense/ArcanistApacheLicenseLinter.php
@@ -25,6 +25,7 @@ class ArcanistApacheLicenseLinter extends ArcanistLicenseLinter {
     $year = date('Y');
 
     return <<<EOLICENSE
+
 /*
  * Copyright {$year} {$copyright_holder}
  *
diff --git a/src/lint/linter/license/ArcanistLicenseLinter.php b/src/lint/linter/license/ArcanistLicenseLinter.php
index d725dad2..fb9fa1fd 100644
--- a/src/lint/linter/license/ArcanistLicenseLinter.php
+++ b/src/lint/linter/license/ArcanistLicenseLinter.php
@@ -56,12 +56,12 @@ abstract class ArcanistLicenseLinter extends ArcanistLinter {
     $patterns = $this->getLicensePatterns();
     $license = $this->getLicenseText($copyright_holder);
 
+    $data = $this->getData($path);
+    $matches = 0;
+
     foreach ($patterns as $pattern) {
-      $data = $this->getData($path);
-      $matches = 0;
       if (preg_match($pattern, $data, $matches)) {
-        $expect = rtrim(implode('', array_slice($matches, 1)))."\n\n".$license;
-        $expect = ltrim($expect);
+        $expect = rtrim(implode('', array_slice($matches, 1)))."\n".$license;
         if (rtrim($matches[0]) != rtrim($expect)) {
           $this->raiseLintAtOffset(
             0,