fix mirroring directory into parent directory

xabbuh · xabbuh · commit b58a806340c6 · 2019-06-23T10:51:25.000+02:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -569,14 +569,15 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
         }
 
         $this->mkdir($targetDir);
-        $targetDirInfo = new \SplFileInfo($targetDir);
+        $filesCreatedWhileMirroring = [];
 
         foreach ($iterator as $file) {
-            if ($file->getPathname() === $targetDir || $file->getRealPath() === $targetDir || 0 === strpos($file->getRealPath(), $targetDirInfo->getRealPath())) {
+            if ($file->getPathname() === $targetDir || $file->getRealPath() === $targetDir || isset($filesCreatedWhileMirroring[$file->getRealPath()])) {
                 continue;
             }
 
             $target = $targetDir.substr($file->getPathname(), $originDirLen);
+            $filesCreatedWhileMirroring[$target] = true;
 
             if (!$copyOnWindows && is_link($file)) {
                 $this->symlink($file->getLinkTarget(), $target);
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1362,6 +1362,22 @@ public function testMirrorAvoidCopyingTargetDirectoryIfInSourceDirectory()
         $this->assertFalse($this->filesystem->exists($targetPath.'target'));
     }
 
+    public function testMirrorFromSubdirectoryInToParentDirectory()
+    {
+        $targetPath = $this->workspace.\DIRECTORY_SEPARATOR.'foo'.\DIRECTORY_SEPARATOR;
+        $sourcePath = $targetPath.'bar'.\DIRECTORY_SEPARATOR;
+        $file1 = $sourcePath.'file1';
+        $file2 = $sourcePath.'file2';
+
+        $this->filesystem->mkdir($sourcePath);
+        file_put_contents($file1, 'FILE1');
+        file_put_contents($file2, 'FILE2');
+
+        $this->filesystem->mirror($sourcePath, $targetPath);
+
+        $this->assertFileEquals($file1, $targetPath.'file1');
+    }
+
     /**
      * @dataProvider providePathsForIsAbsolutePath
      */

Original file line number	Diff line number	Diff line change
`@@ -569,14 +569,15 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`569`	`569`	`}`
`570`	`570`
`571`	`571`	`$this->mkdir($targetDir);`
`572`		`- $targetDirInfo = new \SplFileInfo($targetDir);`
	`572`	`+ $filesCreatedWhileMirroring = [];`
`573`	`573`
`574`	`574`	`foreach ($iterator as $file) {`
`575`		`- if ($file->getPathname() === $targetDir \|\| $file->getRealPath() === $targetDir \|\| 0 === strpos($file->getRealPath(), $targetDirInfo->getRealPath())) {`
	`575`	`+ if ($file->getPathname() === $targetDir \|\| $file->getRealPath() === $targetDir \|\| isset($filesCreatedWhileMirroring[$file->getRealPath()])) {`
`576`	`576`	`continue;`
`577`	`577`	`}`
`578`	`578`
`579`	`579`	`$target = $targetDir.substr($file->getPathname(), $originDirLen);`
	`580`	`+ $filesCreatedWhileMirroring[$target] = true;`
`580`	`581`
`581`	`582`	`if (!$copyOnWindows && is_link($file)) {`
`582`	`583`	`$this->symlink($file->getLinkTarget(), $target);`