Merge pull request thephpleague#495 from twistor/ftp-fclose-write

frankdejonge · frankdejonge · commit 464d0cc913bc · 2015-06-07T17:07:10.000+02:00
Don't depend on fclose() of temp stream for return value to write() in Ftp adapter.
diff --git a/src/Adapter/Ftp.php b/src/Adapter/Ftp.php
@@ -151,23 +151,22 @@ public function disconnect()
      */
     public function write($path, $contents, Config $config)
     {
-        $mimetype = Util::guessMimeType($path, $contents);
-        $config = Util::ensureConfig($config);
-        $stream = tmpfile();
+        $stream = fopen('php://temp', 'w+b');
         fwrite($stream, $contents);
         rewind($stream);
+
         $result = $this->writeStream($path, $stream, $config);
-        $result = fclose($stream) && $result;
+
+        fclose($stream);
 
         if ($result === false) {
             return false;
         }
 
-        if ($visibility = $config->get('visibility')) {
-            $this->setVisibility($path, $visibility);
-        }
+        $result['contents'] = $contents;
+        $result['mimetype'] = Util::guessMimeType($path, $contents);
 
-        return compact('path', 'contents', 'mimetype', 'visibility');
+        return $result;
     }
 
     /**
@@ -176,7 +175,6 @@ public function write($path, $contents, Config $config)
     public function writeStream($path, $resource, Config $config)
     {
         $this->ensureDirectory(Util::dirname($path));
-        $config = Util::ensureConfig($config);
 
         if (! ftp_fput($this->getConnection(), $path, $resource, $this->transferMode)) {
             return false;
diff --git a/src/Adapter/NullAdapter.php b/src/Adapter/NullAdapter.php
@@ -5,7 +5,6 @@
 use League\Flysystem\Adapter\Polyfill\StreamedCopyTrait;
 use League\Flysystem\Adapter\Polyfill\StreamedTrait;
 use League\Flysystem\Config;
-use League\Flysystem\Util;
 
 class NullAdapter extends AbstractAdapter
 {
@@ -30,7 +29,6 @@ public function has($path)
     public function write($path, $contents, Config $config)
     {
         $type = 'file';
-        $config = Util::ensureConfig($config);
         $result = compact('contents', 'type', 'size', 'path');
 
         if ($visibility = $config->get('visibility')) {
diff --git a/tests/UtilMimeTests.php b/tests/UtilMimeTests.php
@@ -24,4 +24,9 @@ public function testNoFinfoFallback()
         $this->assertNull(MimeType::detectByContent('string'));
         $passthru = true;
     }
+
+    public function testNoExtension()
+    {
+        $this->assertNull(MimeType::detectByFileExtension(''));
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`use League\Flysystem\Adapter\Polyfill\StreamedCopyTrait;`
`6`	`6`	`use League\Flysystem\Adapter\Polyfill\StreamedTrait;`
`7`	`7`	`use League\Flysystem\Config;`
`8`		`-use League\Flysystem\Util;`
`9`	`8`
`10`	`9`	`class NullAdapter extends AbstractAdapter`
`11`	`10`	`{`
`@@ -30,7 +29,6 @@ public function has($path)`
`30`	`29`	`public function write($path, $contents, Config $config)`
`31`	`30`	`{`
`32`	`31`	`$type = 'file';`
`33`		`- $config = Util::ensureConfig($config);`
`34`	`32`	`$result = compact('contents', 'type', 'size', 'path');`
`35`	`33`
`36`	`34`	`if ($visibility = $config->get('visibility')) {`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,9 @@ public function testNoFinfoFallback()`
`24`	`24`	`$this->assertNull(MimeType::detectByContent('string'));`
`25`	`25`	`$passthru = true;`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ public function testNoExtension()`
	`29`	`+ {`
	`30`	`+ $this->assertNull(MimeType::detectByFileExtension(''));`
	`31`	`+ }`
`27`	`32`	`}`