[Filesystem] Dont copy perms when origin is remote

nicolas-grekas · nicolas-grekas · commit 7b442211dc8a · 2017-07-05T10:27:10.000+03:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -37,7 +37,8 @@ class Filesystem
      */
     public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
     {
-        if (stream_is_local($originFile) && !is_file($originFile)) {
+        $originIsLocal = stream_is_local($originFile) || 0 === stripos($originFile, 'file://');
+        if ($originIsLocal && !is_file($originFile)) {
             throw new FileNotFoundException(sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);
         }
 
@@ -68,11 +69,13 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)
                 throw new IOException(sprintf('Failed to copy "%s" to "%s".', $originFile, $targetFile), 0, null, $originFile);
             }
 
-            // Like `cp`, preserve executable permission bits
-            @chmod($targetFile, fileperms($targetFile) | (fileperms($originFile) & 0111));
+            if ($originIsLocal) {
+                // Like `cp`, preserve executable permission bits
+                @chmod($targetFile, fileperms($targetFile) | (fileperms($originFile) & 0111));
 
-            if (stream_is_local($originFile) && $bytesCopied !== ($bytesOrigin = filesize($originFile))) {
-                throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);
+                if ($bytesCopied !== $bytesOrigin = filesize($originFile)) {
+                    throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);
+                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ class Filesystem`
`37`	`37`	`*/`
`38`	`38`	`public function copy($originFile, $targetFile, $overwriteNewerFiles = false)`
`39`	`39`	`{`
`40`		`- if (stream_is_local($originFile) && !is_file($originFile)) {`
	`40`	`+ $originIsLocal = stream_is_local($originFile) \|\| 0 === stripos($originFile, 'file://');`
	`41`	`+ if ($originIsLocal && !is_file($originFile)) {`
`41`	`42`	`throw new FileNotFoundException(sprintf('Failed to copy "%s" because file does not exist.', $originFile), 0, null, $originFile);`
`42`	`43`	`}`
`43`	`44`
`@@ -68,11 +69,13 @@ public function copy($originFile, $targetFile, $overwriteNewerFiles = false)`
`68`	`69`	`throw new IOException(sprintf('Failed to copy "%s" to "%s".', $originFile, $targetFile), 0, null, $originFile);`
`69`	`70`	`}`
`70`	`71`
`71`		- // Like `cp`, preserve executable permission bits
`72`		`- @chmod($targetFile, fileperms($targetFile) \| (fileperms($originFile) & 0111));`
	`72`	`+ if ($originIsLocal) {`
	`73`	+ // Like `cp`, preserve executable permission bits
	`74`	`+ @chmod($targetFile, fileperms($targetFile) \| (fileperms($originFile) & 0111));`
`73`	`75`
`74`		`- if (stream_is_local($originFile) && $bytesCopied !== ($bytesOrigin = filesize($originFile))) {`
`75`		`- throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);`
	`76`	`+ if ($bytesCopied !== $bytesOrigin = filesize($originFile)) {`
	`77`	`+ throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s" (%g of %g bytes copied).', $originFile, $targetFile, $bytesCopied, $bytesOrigin), 0, null, $originFile);`
	`78`	`+ }`
`76`	`79`	`}`
`77`	`80`	`}`
`78`	`81`	`}`