Fix handling one-letter git refs in lockfile paths

Add regression tests for Windows absolute base lock paths and one-letter ref:path syntax.

Author: wikando-ck

src/PackageDiff.php

@@ -213,11 +213,11 @@ private function getFileContents($path, $lockFile = true)
             return file_get_contents($localPath);
         }
 
-        if ($lockFile && false === strpos($originalPath, self::GIT_SEPARATOR) && $this->looksLikeComposerLockFile($localPath)) {
+        if ($lockFile && !$this->containsGitSeparator($originalPath) && $this->looksLikeComposerLockFile($localPath)) {
             return '{}';
         }
 
-        if (false === strpos($originalPath, self::GIT_SEPARATOR)) {
+        if (!$this->containsGitSeparator($originalPath)) {
             $path .= self::GIT_SEPARATOR.self::COMPOSER.($lockFile ? self::EXTENSION_LOCK : self::EXTENSION_JSON);
         }
 
@@ -265,6 +265,29 @@ private function isMissingFileError($gitOutput)
         return false !== stripos($gitOutput, 'does not exist in') || false !== stripos($gitOutput, 'exists on disk, but not in');
     }
 
+    /**
+     * @param string $path
+     *
+     * @return bool
+     */
+    private function containsGitSeparator($path)
+    {
+        $pos = strpos($path, self::GIT_SEPARATOR);
+
+        if (false === $pos) {
+            return false;
+        }
+
+        // Ignore Windows absolute drive paths (e.g. "C:\path" or "C:/path").
+        if (1 === $pos && ctype_alpha($path[0])) {
+            if (isset($path[2]) && ('\\' === $path[2] || '/' === $path[2])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * @param string $path
      *

tests/PackageDiffTest.php

@@ -189,6 +189,41 @@ public function testDiffAgainstMissingGitLockFilePath()
         }
     }
 
+    public function testDiffAgainstMissingWindowsAbsoluteBaseLockFile()
+    {
+        $diff = new PackageDiff();
+
+        $prodOperations = $diff->getPackageDiff(
+            'C:\\tmp\\missing\\composer.lock',
+            __DIR__.'/fixtures/empty-target/composer.lock',
+            false,
+            false
+        );
+        $devOperations = $diff->getPackageDiff(
+            'C:\\tmp\\missing\\composer.lock',
+            __DIR__.'/fixtures/empty-target/composer.lock',
+            true,
+            false
+        );
+
+        $this->assertSame(array(
+            'install example/package 1.2.3',
+        ), array_map(array($this, 'entryToString'), $prodOperations->getArrayCopy()));
+        $this->assertSame(array(
+            'install example/dev-package 2.3.4',
+        ), array_map(array($this, 'entryToString'), $devOperations->getArrayCopy()));
+    }
+
+    public function testOneLetterGitRefPath()
+    {
+        $diff = new PackageDiff();
+        $this->prepareGit();
+        exec('git branch -f z');
+        $operations = $diff->getPackageDiff('z:composer.lock', '', false, false);
+
+        $this->assertNotEmpty($operations);
+    }
+
     public function diffOperationsProvider()
     {
         return array(