Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit e08b049d574f · 2018-09-08T15:24:10.000+02:00
* 3.4:
  [DI] configure inlined services before injecting them when dumping the container
  Consistently throw exceptions on a single line
  fix fopen calls
  Update .editorconfig
diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
@@ -161,7 +161,7 @@ public function testCopyCreatesTargetDirectoryIfItDoesNotExist()
      */
     public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
     {
-        if (!in_array('https', stream_get_wrappers())) {
+        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';

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