Fixed failing test for HHVM

pierredup · pierredup · commit f6771a8bc949 · 2015-10-12T21:13:25.000+02:00
diff --git a/src/Symfony/Component/Filesystem/Filesystem.php b/src/Symfony/Component/Filesystem/Filesystem.php
@@ -560,6 +560,6 @@ private function getSchemeAndHierarchy($filename)
     {
         $components = explode('://', $filename, 2);
 
-        return  2 === count($components) ? 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
@@ -1045,7 +1045,7 @@ public function testTempnamOnUnwritableFallsBackToSysTmp()
         $this->assertFileExists($filename);
 
         // Tear down
-        unlink($filename);
+        @unlink($filename);
     }
 
     public function testDumpFile()
@@ -1104,6 +1104,10 @@ public function testDumpFileOverwritesAnExistingFile()
 
     public function testDumpFileWithFileScheme()
     {
+        if (defined('HHVM_VERSION')) {
+            $this->markTestSkipped('HHVM does not handle the file:// scheme correctly');
+        }
+
         $scheme = 'file://';
         $filename = $scheme.$this->workspace.DIRECTORY_SEPARATOR.'foo'.DIRECTORY_SEPARATOR.'baz.txt';
 

Original file line number	Diff line number	Diff line change
`@@ -560,6 +560,6 @@ private function getSchemeAndHierarchy($filename)`
`560`	`560`	`{`
`561`	`561`	`$components = explode('://', $filename, 2);`
`562`	`562`
`563`		`- return 2 === count($components) ? array($components[0], $components[1]) : array(null, $components[0]);`
	`563`	`+ return 2 === count($components) ? array($components[0], $components[1]) : array(null, $components[0]);`
`564`	`564`	`}`
`565`	`565`	`}`