Removed unused logic in MockStream

pierredup · pierredup · commit 61a3afd829e3 · 2015-11-09T17:11:40.000+02:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -459,34 +459,30 @@ public function isAbsolutePath($file)
      * @param string $prefix The prefix of the generated temporary filename.
      *                       Note: Windows uses only the first three characters of prefix.
      *
-     * @return string The new temporary filename (with path), or false on failure.
+     * @return string The new temporary filename (with path), or throw an exception on failure.
      */
     public function tempnam($dir, $prefix)
     {
-        $limit = 10;
         list($scheme, $hierarchy) = $this->getSchemeAndHierarchy($dir);
 
         // If no scheme or scheme is "file" create temp file in local filesystem
         if (null === $scheme || 'file' === $scheme) {
-
             $tmpFile = tempnam($hierarchy, $prefix);
 
             // If tempnam failed or no scheme return the filename otherwise prepend the scheme
-
-            if (null !== $scheme) {
-                return $scheme.'://'.$tmpFile;
-            }
-
             if (false !== $tmpFile) {
+                if (null !== $scheme) {
+                    return $scheme.'://'.$tmpFile;
+                }
+
                 return $tmpFile;
             }
 
-            throw new IOException('A temporary file could not be created');
+            throw new IOException('A temporary file could not be created.');
         }
 
-        // Loop until we create a valid temp file or have reached $limit attempts
-        for ($i = 0; $i < $limit; ++$i) {
-
+        // Loop until we create a valid temp file or have reached 10 attempts
+        for ($i = 0; $i < 10; ++$i) {
             // Create a unique filename
             $tmpFile = $dir.'/'.$prefix.uniqid(mt_rand(), true);
 
@@ -503,10 +499,9 @@ public function tempnam($dir, $prefix)
             @fclose($handle);
 
             return $tmpFile;
-
         }
 
-        return false;
+        throw new IOException('A temporary file could not be created.');
     }
 
     /**
@@ -570,7 +565,6 @@ private function getSchemeAndHierarchy($filename)
     {
         $components = explode('://', $filename, 2);
 
-        return count($components) === 2 ? array($components[0], $components[1]) : array(null, $components[0]);
+        return  2 === count($components) ? array($components[0], $components[1]) : array(null, $components[0]);
     }
-
 }
diff --git a/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php b/src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Filesystem\Tests;
 
-use Phar;
 /**
  * Test class for Filesystem.
  */
@@ -953,7 +952,6 @@ public function testTempnam()
 
         $filename = $this->filesystem->tempnam($dirname, 'foo');
 
-        $this->assertNotFalse($filename);
         $this->assertFileExists($filename);
     }
 
@@ -964,39 +962,34 @@ public function testTempnamWithFileScheme()
 
         $filename = $this->filesystem->tempnam($dirname, 'foo');
 
-        $this->assertNotFalse($filename);
         $this->assertStringStartsWith($scheme, $filename);
         $this->assertFileExists($filename);
     }
 
     public function testTempnamWithMockScheme()
     {
-        // We avoid autoloading via ClassLoader as stream_wrapper_register creates the object
-        if (!@include __DIR__.DIRECTORY_SEPARATOR.'Fixtures'.DIRECTORY_SEPARATOR.'MockStream'.DIRECTORY_SEPARATOR.'MockStream.php') {
-            $this->markTestSkipped('Unable to load mock:// stream.');
-        }
-
-        stream_wrapper_register('mock', 'MockStream\MockStream');
+        stream_wrapper_register('mock', 'Symfony\Component\Filesystem\Tests\Fixtures\MockStream\MockStream');
 
         $scheme = 'mock://';
         $dirname = $scheme.$this->workspace;
 
         $filename = $this->filesystem->tempnam($dirname, 'foo');
 
-        $this->assertNotFalse($filename);
         $this->assertStringStartsWith($scheme, $filename);
         $this->assertFileExists($filename);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
+     */
     public function testTempnamWithZlibSchemeFails()
     {
         $scheme = 'compress.zlib://';
         $dirname = $scheme.$this->workspace;
 
-        $filename = $this->filesystem->tempnam($dirname, 'bar');
-
         // The compress.zlib:// stream does not support mode x: creates the file, errors "failed to open stream: operation failed" and returns false
-        $this->assertFalse($filename);
+        $this->filesystem->tempnam($dirname, 'bar');
+
     }
 
     public function testTempnamWithPHPTempSchemeFails()
@@ -1006,40 +999,41 @@ public function testTempnamWithPHPTempSchemeFails()
 
         $filename = $this->filesystem->tempnam($dirname, 'bar');
 
-        $this->assertNotFalse($filename);
         $this->assertStringStartsWith($scheme, $filename);
 
         // The php://temp stream deletes the file after close
         $this->assertFileNotExists($filename);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
+     */
     public function testTempnamWithPharSchemeFails()
     {
         // Skip test if Phar disabled phar.readonly must be 0 in php.ini
-        if (!Phar::canWrite()) {
+        if (!\Phar::canWrite()) {
             $this->markTestSkipped('This test cannot run when phar.readonly is 1.');
         }
 
         $scheme = 'phar://';
         $dirname = $scheme.$this->workspace;
         $pharname = 'foo.phar';
 
-        $p = new Phar($this->workspace.'/'.$pharname, 0, $pharname);
-        $filename = $this->filesystem->tempnam($dirname, $pharname.'/bar');
-
+        new \Phar($this->workspace.'/'.$pharname, 0, $pharname);
         // The phar:// stream does not support mode x: fails to create file, errors "failed to open stream: phar error: "$filename" is not a file in phar "$pharname"" and returns false
-        $this->assertFalse($filename);
+        $this->filesystem->tempnam($dirname, $pharname.'/bar');
     }
 
+    /**
+     * @expectedException \Symfony\Component\Filesystem\Exception\IOException
+     */
     public function testTempnamWithHTTPSchemeFails()
     {
         $scheme = 'http://';
         $dirname = $scheme.$this->workspace;
 
-        $filename = $this->filesystem->tempnam($dirname, 'bar');
-
         // The http:// scheme is read-only
-        $this->assertFalse($filename);
+        $this->filesystem->tempnam($dirname, 'bar');
     }
 
     public function testTempnamOnUnwritableFallsBackToSysTmp()
@@ -1049,7 +1043,6 @@ public function testTempnamOnUnwritableFallsBackToSysTmp()
 
         $filename = $this->filesystem->tempnam($dirname, 'bar');
 
-        $this->assertNotFalse($filename);
         $this->assertStringStartsWith(rtrim($scheme.sys_get_temp_dir(), DIRECTORY_SEPARATOR), $filename);
         $this->assertFileExists($filename);
 
diff --git a/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php b/src/Symfony/Component/Filesystem/Tests/Fixtures/MockStream/MockStream.php
