bug #23092 [Filesystem] added workaround in Filesystem::rename for PHP bug (VolCh)

fabpot · fabpot · commit 3722051ba968 · 2017-06-14T12:55:44.000-07:00
This PR was squashed before being merged into the 2.7 branch (closes #23092). Discussion ---------- [Filesystem] added workaround in Filesystem::rename for PHP bug [Filesystem] added workaround in Filesystem::rename for https://bugs.php.net/bug.php?id=54097 Standard PHP rename() of dirs across devices/mounted filesystems produces confusing copy error & throws IOException in Filesystem::rename. I got it during console cache:clear in the Docker environment. This PR possible fixes symfony/symfony#19851 and other environment related issues. Workaround is on \rename() fails try to Filesystem::mirror & Filesystem::remove if $origin is directory | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 3ccbc479da [Filesystem] added workaround in Filesystem::rename for PHP bug
diff --git a/Filesystem.php b/Filesystem.php
@@ -276,6 +276,13 @@ public function rename($origin, $target, $overwrite = false)
         }
 
         if (true !== @rename($origin, $target)) {
+            if (is_dir($origin)) {
+                // See https://bugs.php.net/bug.php?id=54097 & http://php.net/manual/en/function.rename.php#113943
+                $this->mirror($origin, $target, null, array('override' => $overwrite, 'delete' => $overwrite));
+                $this->remove($origin);
+
+                return;
+            }
             throw new IOException(sprintf('Cannot rename "%s" to "%s".', $origin, $target), 0, null, $target);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,13 @@ public function rename($origin, $target, $overwrite = false)`
`276`	`276`	`}`
`277`	`277`
`278`	`278`	`if (true !== @rename($origin, $target)) {`
	`279`	`+ if (is_dir($origin)) {`
	`280`	`+ // See https://bugs.php.net/bug.php?id=54097 & http://php.net/manual/en/function.rename.php#113943`
	`281`	`+ $this->mirror($origin, $target, null, array('override' => $overwrite, 'delete' => $overwrite));`
	`282`	`+ $this->remove($origin);`
	`283`	`+`
	`284`	`+ return;`
	`285`	`+ }`
`279`	`286`	`throw new IOException(sprintf('Cannot rename "%s" to "%s".', $origin, $target), 0, null, $target);`
`280`	`287`	`}`
`281`	`288`	`}`