minor #13692 [Filesystem] Improve exception message for copy method (King2500)

fabpot · fabpot · commit 3bbca21630c6 · 2015-02-16T10:13:40.000+01:00
This PR was submitted for the 2.6 branch but it was merged into the 2.7 branch instead (closes #13692). Discussion ---------- [Filesystem] Improve exception message for copy method see diff | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes? (no change in semantics) | Fixed tickets | | License | MIT | Doc PR | Commits ------- 021206c [Filesystem] Improve exception message for copy method
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -72,8 +72,8 @@ public function copy($originFile, $targetFile, $override = false)
             // Like `cp`, preserve executable permission bits
             @chmod($targetFile, fileperms($targetFile) | (fileperms($originFile) & 0111));
 
-            if (stream_is_local($originFile) && $bytesCopied !== filesize($originFile)) {
-                throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s %g bytes copied".', $originFile, $targetFile, $bytesCopied), 0, null, $originFile);
+            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);
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ public function copy($originFile, $targetFile, $override = false)`
`72`	`72`	// Like `cp`, preserve executable permission bits
`73`	`73`	`@chmod($targetFile, fileperms($targetFile) \| (fileperms($originFile) & 0111));`
`74`	`74`
`75`		`- if (stream_is_local($originFile) && $bytesCopied !== filesize($originFile)) {`
`76`		`- throw new IOException(sprintf('Failed to copy the whole content of "%s" to "%s %g bytes copied".', $originFile, $targetFile, $bytesCopied), 0, null, $originFile);`
	`75`	`+ if (stream_is_local($originFile) && $bytesCopied !== ($bytesOrigin = filesize($originFile))) {`
	`76`	`+ 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);`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`}`