Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit 09513e5bef92 · 2018-09-03T10:41:44.000+02:00
* 3.4:
  Fix appveyor
diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
@@ -161,6 +161,9 @@ public function testCopyCreatesTargetDirectoryIfItDoesNotExist()
      */
     public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
     {
+        if (!in_array('https', stream_get_wrappers())) {
+            $this->markTestSkipped('"https" stream wrapper is not enabled.');
+        }
         $sourceFilePath = 'https://symfony.com/images/common/logo/logo_symfony_header.png';
         $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
 

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,9 @@ public function testCopyCreatesTargetDirectoryIfItDoesNotExist()`
`161`	`161`	`*/`
`162`	`162`	`public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()`
`163`	`163`	`{`
	`164`	`+ if (!in_array('https', stream_get_wrappers())) {`
	`165`	`+ $this->markTestSkipped('"https" stream wrapper is not enabled.');`
	`166`	`+ }`
`164`	`167`	`$sourceFilePath = 'https://symfony.com/images/common/logo/logo_symfony_header.png';`
`165`	`168`	`$targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';`
`166`	`169`