Also catch lines which begin with whitespace

dxw · Jan 6, 2016 · 50dff14 · 50dff14
1 parent 9101da4
commit 50dff14
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lib/modules/helpers/manifest_io.trait.php b/lib/modules/helpers/manifest_io.trait.php
@@ -12,7 +12,7 @@ protected function load_plugins_manifest() {
     $raw_file = file_get_contents($this->plugins_manifest_file);
     $lines = explode("\n", $raw_file);
     foreach ($lines as $line) {
-        if (preg_match('/^#/', $line)) {
+        if (preg_match('/^\s*#/', $line)) {
             echo "Comments beginning with # are not permitted\n";
             exit(1);
         }
@@ -141,4 +141,4 @@ private function update_plugins_lock()
 
     return file_put_contents($this->plugins_lock_file, json_encode($this->plugins_locked, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
   }
-};
+};
diff --git a/tests/plugins_test.php b/tests/plugins_test.php
@@ -71,4 +71,20 @@ function testDeprecatedCommentSyntax()
         $this->assertNotContains('PHP Notice', $stderr);
         $this->assertNotContains('PHP Deprecated', $stderr);
     }
+
+    function testDeprecatedCommentSyntax2()
+    {
+        // Add whitespace before the #
+        $this->createTestDir();
+        file_put_contents($this->dir.'/plugins', "source = \"git-repo/\"\nadvanced-custom-fields=\n # a bad comment\n");
+
+        list($return, $stdout, $stderr) = $this->cmd('../../bin/whippet plugins install', dirname(__DIR__).'/'.$this->dir);
+
+        $this->assertEquals(1, $return);
+
+        $this->assertNotContains('PHP Fatal error', $stderr);
+        $this->assertNotContains('PHP Warning', $stderr);
+        $this->assertNotContains('PHP Notice', $stderr);
+        $this->assertNotContains('PHP Deprecated', $stderr);
+    }
 }