bug #23473 [Filesystem] mirror - fix copying content with same name as source/target. (gitlost)

fabpot · fabpot · commit 5bf241aa8e7b · 2017-09-13T09:02:25.000-07:00
This PR was squashed before being merged into the 2.7 branch (closes #23473). Discussion ---------- [Filesystem] mirror - fix copying content with same name as source/target. | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23472 | License | MIT | Doc PR | Uses `substr()` and lengths in `Filesystem::mirror()` rather than `str_replace()` to avoid multiple replacements. Commits ------- b524c84 [Filesystem] mirror - fix copying content with same name as source/target.
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -444,6 +444,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
     {
         $targetDir = rtrim($targetDir, '/\\');
         $originDir = rtrim($originDir, '/\\');
+        $originDirLen = strlen($originDir);
 
         // Iterate in destination folder to remove obsolete entries
         if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {
@@ -452,8 +453,9 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
                 $flags = \FilesystemIterator::SKIP_DOTS;
                 $deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);
             }
+            $targetDirLen = strlen($targetDir);
             foreach ($deleteIterator as $file) {
-                $origin = str_replace($targetDir, $originDir, $file->getPathname());
+                $origin = $originDir.substr($file->getPathname(), $targetDirLen);
                 if (!$this->exists($origin)) {
                     $this->remove($file);
                 }
@@ -475,7 +477,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o
         }
 
         foreach ($iterator as $file) {
-            $target = str_replace($originDir, $targetDir, $file->getPathname());
+            $target = $targetDir.substr($file->getPathname(), $originDirLen);
 
             if ($copyOnWindows) {
                 if (is_file($file)) {
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -1009,6 +1009,53 @@ public function testMirrorCopiesRelativeLinkedContents()
         $this->assertEquals('\\' === DIRECTORY_SEPARATOR ? realpath($sourcePath.'\nested') : 'nested', readlink($targetPath.DIRECTORY_SEPARATOR.'link1'));
     }
 
+    public function testMirrorContentsWithSameNameAsSourceOrTargetWithoutDeleteOption()
+    {
+        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
+
+        mkdir($sourcePath);
+        touch($sourcePath.'source');
+        touch($sourcePath.'target');
+
+        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
+
+        $oldPath = getcwd();
+        chdir($this->workspace);
+
+        $this->filesystem->mirror('source', $targetPath);
+
+        chdir($oldPath);
+
+        $this->assertTrue(is_dir($targetPath));
+        $this->assertFileExists($targetPath.'source');
+        $this->assertFileExists($targetPath.'target');
+    }
+
+    public function testMirrorContentsWithSameNameAsSourceOrTargetWithDeleteOption()
+    {
+        $sourcePath = $this->workspace.DIRECTORY_SEPARATOR.'source'.DIRECTORY_SEPARATOR;
+
+        mkdir($sourcePath);
+        touch($sourcePath.'source');
+
+        $targetPath = $this->workspace.DIRECTORY_SEPARATOR.'target'.DIRECTORY_SEPARATOR;
+
+        mkdir($targetPath);
+        touch($targetPath.'source');
+        touch($targetPath.'target');
+
+        $oldPath = getcwd();
+        chdir($this->workspace);
+
+        $this->filesystem->mirror('source', 'target', null, array('delete' => true));
+
+        chdir($oldPath);
+
+        $this->assertTrue(is_dir($targetPath));
+        $this->assertFileExists($targetPath.'source');
+        $this->assertFileNotExists($targetPath.'target');
+    }
+
     /**
      * @dataProvider providePathsForIsAbsolutePath
      */

Original file line number	Diff line number	Diff line change
`@@ -444,6 +444,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`444`	`444`	`{`
`445`	`445`	`$targetDir = rtrim($targetDir, '/\\');`
`446`	`446`	`$originDir = rtrim($originDir, '/\\');`
	`447`	`+ $originDirLen = strlen($originDir);`
`447`	`448`
`448`	`449`	`// Iterate in destination folder to remove obsolete entries`
`449`	`450`	`if ($this->exists($targetDir) && isset($options['delete']) && $options['delete']) {`
`@@ -452,8 +453,9 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`452`	`453`	`$flags = \FilesystemIterator::SKIP_DOTS;`
`453`	`454`	`$deleteIterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($targetDir, $flags), \RecursiveIteratorIterator::CHILD_FIRST);`
`454`	`455`	`}`
	`456`	`+ $targetDirLen = strlen($targetDir);`
`455`	`457`	`foreach ($deleteIterator as $file) {`
`456`		`- $origin = str_replace($targetDir, $originDir, $file->getPathname());`
	`458`	`+ $origin = $originDir.substr($file->getPathname(), $targetDirLen);`
`457`	`459`	`if (!$this->exists($origin)) {`
`458`	`460`	`$this->remove($file);`
`459`	`461`	`}`
`@@ -475,7 +477,7 @@ public function mirror($originDir, $targetDir, \Traversable $iterator = null, $o`
`475`	`477`	`}`
`476`	`478`
`477`	`479`	`foreach ($iterator as $file) {`
`478`		`- $target = str_replace($originDir, $targetDir, $file->getPathname());`
	`480`	`+ $target = $targetDir.substr($file->getPathname(), $originDirLen);`
`479`	`481`
`480`	`482`	`if ($copyOnWindows) {`
`481`	`483`	`if (is_file($file)) {`