Merge branch '3.4' into 4.1

sroze · sroze · commit 80f9dd25a014 · 2018-09-02T18:33:37.000+01:00
* 3.4:
  Use the real image URL for the filesystem tests
  [Finder] Update PHPdoc append()
  [DI] Fix phpdoc
  Fix code examples in PHPDoc
  [HttpKernel] Fix inheritdocs
  bumped Symfony version to 3.4.16
  updated VERSION for 3.4.15
  updated CHANGELOG for 3.4.15
diff --git a/Tests/FilesystemTest.php b/Tests/FilesystemTest.php
@@ -161,7 +161,7 @@ public function testCopyCreatesTargetDirectoryIfItDoesNotExist()
      */
     public function testCopyForOriginUrlsAndExistingLocalFileDefaultsToCopy()
     {
-        $sourceFilePath = 'http://symfony.com/images/common/logo/logo_symfony_header.png';
+        $sourceFilePath = 'https://symfony.com/images/common/logo/logo_symfony_header.png';
         $targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';
 
         file_put_contents($targetFilePath, 'TARGET FILE');

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`		`- $sourceFilePath = 'http://symfony.com/images/common/logo/logo_symfony_header.png';`
	`164`	`+ $sourceFilePath = 'https://symfony.com/images/common/logo/logo_symfony_header.png';`
`165`	`165`	`$targetFilePath = $this->workspace.\DIRECTORY_SEPARATOR.'copy_target_file';`
`166`	`166`
`167`	`167`	`file_put_contents($targetFilePath, 'TARGET FILE');`