Correctly handle lockfile git ignoring

Author: BrainMaestro

src/Commands/AddCommand.php

@@ -110,7 +110,7 @@ private function addHook($hook, $contents)
     private function addLockFile()
     {
         if ($this->noLock) {
-            $this->debug("Skipped creating a [{$this->lockFile}] file");
+            $this->debug('Skipped creating a [' . Hook::LOCK_FILE . '] file');
             return;
         }
 
@@ -125,15 +125,15 @@ private function ignoreLockFile()
         }
 
         if (! $this->ignoreLock) {
-            $this->debug("Skipped adding [{$this->lockFile}] to .gitignore");
+            $this->debug('Skipped adding [' . Hook::LOCK_FILE . '] to .gitignore');
             return;
         }
 
         $contents = file_get_contents('.gitignore');
-        $return = strpos($contents, $this->lockFile);
+        $return = strpos($contents, Hook::LOCK_FILE);
 
         if ($return === false) {
-            file_put_contents('.gitignore', Hook::LOCK_FILE . PHP_EOL, FILE_APPEND);
+            file_put_contents('.gitignore', Hook::LOCK_FILE . PHP_EOL . PHP_EOL, FILE_APPEND);
             $this->debug(sprintf('Added [%s] to .gitignore', Hook::LOCK_FILE));
         }
     }

tests/AddCommandTest.php

@@ -138,7 +138,7 @@ public function it_does_not_create_the_hook_lock_file_if_the_no_lock_option_is_p
         $currentDir = realpath(getcwd());
         $this->commandTester->execute(['--no-lock' => true], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE]);
 
-        $this->assertContains('Skipped creating a ' . $currentDir . '/' . Hook::LOCK_FILE  . ' file', $this->commandTester->getDisplay());
+        $this->assertContains('Skipped creating a ' . Hook::LOCK_FILE . ' file', $this->commandTester->getDisplay());
         $this->assertFileNotExists(Hook::LOCK_FILE);
     }
 
@@ -150,7 +150,7 @@ public function it_does_not_ignore_the_hook_lock_file()
         $currentDir = realpath(getcwd());
         $this->commandTester->execute([], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE]);
 
-        $this->assertContains('Skipped adding '. $currentDir . '/' . Hook::LOCK_FILE . ' to .gitignore', $this->commandTester->getDisplay());
+        $this->assertContains('Skipped adding ' . Hook::LOCK_FILE . ' to .gitignore', $this->commandTester->getDisplay());
         $this->assertFalse(strpos(file_get_contents('.gitignore'), Hook::LOCK_FILE));
     }
 
@@ -165,6 +165,18 @@ public function it_ignores_the_hook_lock_file_if_the_ignore_lock_option_is_passe
         $this->assertTrue(strpos(file_get_contents('.gitignore'), Hook::LOCK_FILE) !== false);
     }
 
+    /**
+     * @test
+     */
+    public function it_does_not_ignore_the_hook_lock_file_if_it_is_already_ignored()
+    {
+        file_put_contents('.gitignore', Hook::LOCK_FILE . PHP_EOL, FILE_APPEND);
+        $this->commandTester->execute(['--ignore-lock' => true], ['verbosity' => OutputInterface::VERBOSITY_VERBOSE]);
+
+        $this->assertNotContains('Added ' . Hook::LOCK_FILE . ' to .gitignore', $this->commandTester->getDisplay());
+        $this->assertTrue(strpos(file_get_contents('.gitignore'), Hook::LOCK_FILE) !== false);
+    }
+
     /**
      * @test
      */