bug #32138 [Filesystem] fix mirroring directory into parent directory (xabbuh)

fabpot · fabpot · commit c245f7c6812d · 2019-06-26T09:23:20.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- [Filesystem] fix mirroring directory into parent directory | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #32089 | License | MIT | Doc PR | Commits ------- b58a806 fix mirroring directory into parent directory
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);

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);`