[File] Fix relative paths calculation for mixed slash paths

features/bootstrap/FeatureContext.php

@@ -121,14 +121,12 @@ protected function formatExpectedPatch($patch)
     {
         if ('\\' === DIRECTORY_SEPARATOR) {
             $formatLine = function ($line) {
-                if (0 === strpos($line, '---') || 0 === strpos($line, '+++')) {
-                    $line = preg_replace('~/(?<!(a|b)/)~', '\\', $line);
-                }
-
+                // replace lines for diff-path-files starting with --- or +++
                 $line = preg_replace_callback('~^((?:---|\+\+\+)\s*(?:a|b)/)(.*)~', function ($match) {
                     list($all, $diff, $path) = $match;
 
-                    if (0 === preg_match('~^[a-z]+://~i', $path)) {
+                    // dont replace wrapped path separators
+                    if (! preg_match('~^[a-z]+://~i', $path)) {
                         $path = str_replace('/', '\\', $path);
                     }
 

src/main/QafooLabs/Refactoring/Domain/Model/File.php

@@ -37,6 +37,11 @@ public static function createFromPath($path, $workingDirectory)
         $workingDirectory = rtrim($workingDirectory, '/\\');
         $relativePath = ltrim(str_replace($workingDirectory, "", $path), "/\\");
 
+        // converted mixed, wrapped, absolute paths on windows
+        if (DIRECTORY_SEPARATOR === '\\' && strpos($relativePath, '://') !== FALSE) {
+            $relativePath = str_replace('\\', '/', $relativePath);
+        }
+
         return new self($relativePath, $code);
     }
 
@@ -94,11 +99,13 @@ private function parseFileForPsr0NamespaceName()
     {
         $file = ltrim($this->getRelativePath(), DIRECTORY_SEPARATOR);
 
+        $separator = DIRECTORY_SEPARATOR;
         if (preg_match('(^([a-z]+:\/\/))', $file, $matches)) {
             $file = substr($file, strlen($matches[1]));
+            $separator = '/';
         }
 
-        $parts = explode(DIRECTORY_SEPARATOR, ltrim($this->getRelativePath(), DIRECTORY_SEPARATOR));
+        $parts = explode($separator, $file);
         $namespace = array();
 
         foreach ($parts as $part) {
@@ -120,4 +127,3 @@ private function startsWithLowerCase($string)
         return isset($string[0]) && strtolower($string[0]) === $string[0];
     }
 }
-

src/test/QafooLabs/Refactoring/Domain/Model/FileTest.php

@@ -34,11 +34,20 @@ public function testGetRelativePathRespectsMixedWindowsPathsAndWorkingDirectoryT
         $this->assertEquals("Foo\Bar.php", $file->getRelativePath());
     }
 
+    public function testRelativePathConstructionForAbsoluteVFSFiles()
+    {
+        $src = $this->createFileSystem()->getChild('src')->url();
+        $bar = $src.DIRECTORY_SEPARATOR.'Foo'.DIRECTORY_SEPARATOR.'Bar.php';
+
+        $file = File::createFromPath($bar, $notRelatedWorkingDir = __DIR__);
+        $this->assertEquals('vfs://project/src/Foo/Bar.php', $file->getRelativePath());
+    }
+
     static public function dataExtractPsr0ClassName()
     {
         return array(
-            array(new PhpName('Foo', 'Foo'), 'src/Foo.php'),
-            array(new PhpName('Foo\Bar', 'Bar'), 'src/Foo/Bar.php'),
+            array(new PhpName('Foo', 'Foo'), 'src'.DIRECTORY_SEPARATOR.'Foo.php'),
+            array(new PhpName('Foo\Bar', 'Bar'), 'src'.DIRECTORY_SEPARATOR.'Foo'.DIRECTORY_SEPARATOR.'Bar.php'),
         );
     }