Use stream_copy_to_stream().

twistor · twistor · commit 30c5b1531ca6 · 2015-05-27T21:16:54.000-07:00
diff --git a/src/Adapter/Local.php b/src/Adapter/Local.php
@@ -104,9 +104,7 @@ public function writeStream($path, $resource, Config $config)
             return false;
         }
 
-        while (! feof($resource)) {
-            fwrite($stream, fread($resource, 1024), 1024);
-        }
+        stream_copy_to_stream($resource, $stream);
 
         if (! fclose($stream)) {
             return false;
diff --git a/tests/LocalAdapterTests.php b/tests/LocalAdapterTests.php
@@ -4,14 +4,14 @@
 
 use League\Flysystem\Config;
 
-function fopen($result)
+function fopen($result, $mode)
 {
     if (substr($result, -5) === 'false') {
         return false;
     }
 
     if (substr($result, -5) === 'dummy') {
-        return 'dummy';
+        return fopen('data://text/plain,', $mode);
     }
 
     return call_user_func_array('fopen', func_get_args());
@@ -28,7 +28,7 @@ function fwrite($result)
 
 function fclose($result)
 {
-    if (is_string($result) and substr($result, -5) === 'dummy') {
+    if (is_resource($result) && stream_get_meta_data($result)['stream_type'] === 'RFC2397') {
         return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,7 @@ public function writeStream($path, $resource, Config $config)`
`104`	`104`	`return false;`
`105`	`105`	`}`
`106`	`106`
`107`		`- while (! feof($resource)) {`
`108`		`- fwrite($stream, fread($resource, 1024), 1024);`
`109`		`- }`
	`107`	`+ stream_copy_to_stream($resource, $stream);`
`110`	`108`
`111`	`109`	`if (! fclose($stream)) {`
`112`	`110`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,14 @@`
`4`	`4`
`5`	`5`	`use League\Flysystem\Config;`
`6`	`6`
`7`		`-function fopen($result)`
	`7`	`+function fopen($result, $mode)`
`8`	`8`	`{`
`9`	`9`	`if (substr($result, -5) === 'false') {`
`10`	`10`	`return false;`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`if (substr($result, -5) === 'dummy') {`
`14`		`- return 'dummy';`
	`14`	`+ return fopen('data://text/plain,', $mode);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`return call_user_func_array('fopen', func_get_args());`
`@@ -28,7 +28,7 @@ function fwrite($result)`
`28`	`28`
`29`	`29`	`function fclose($result)`
`30`	`30`	`{`
`31`		`- if (is_string($result) and substr($result, -5) === 'dummy') {`
	`31`	`+ if (is_resource($result) && stream_get_meta_data($result)['stream_type'] === 'RFC2397') {`
`32`	`32`	`return false;`
`33`	`33`	`}`
`34`	`34`