Merge branch '4.4' into 5.0

fabpot · fabpot · commit 6b9ed15c12a3 · 2020-06-24T15:36:01.000+02:00
* 4.4:
  [HttpClient] Support for cURL handler objects.
  [HttpClient] unset activity list when creating CurlResponse
  Fixed typo in test name
  add .body wrapper element
  [HttpFondation] Change file extension of "audio/mpeg" from "mpga" to "mp3"
  [VarDumper] Support for cURL handler objects.
  Check whether path is file in DataPart::fromPath()
  [DI][FrameworkBundle] Remove whitelist occurrences
  Avoid accessibility errors on debug toolbar
diff --git a/DependencyInjection/Compiler/UnusedTagsPass.php b/DependencyInjection/Compiler/UnusedTagsPass.php
@@ -21,7 +21,7 @@
  */
 class UnusedTagsPass implements CompilerPassInterface
 {
-    private $whitelist = [
+    private $knownTags = [
         'annotations.cached_reader',
         'auto_alias',
         'cache.pool',
@@ -85,11 +85,11 @@ class UnusedTagsPass implements CompilerPassInterface
 
     public function process(ContainerBuilder $container)
     {
-        $tags = array_unique(array_merge($container->findTags(), $this->whitelist));
+        $tags = array_unique(array_merge($container->findTags(), $this->knownTags));
 
         foreach ($container->findUnusedTags() as $tag) {
-            // skip whitelisted tags
-            if (\in_array($tag, $this->whitelist)) {
+            // skip known tags
+            if (\in_array($tag, $this->knownTags)) {
                 continue;
             }
 
diff --git a/Resources/bin/check-unused-known-tags.php b/Resources/bin/check-unused-known-tags.php
@@ -15,5 +15,5 @@
 
 $target = dirname(__DIR__, 2).'/DependencyInjection/Compiler/UnusedTagsPass.php';
 $contents = file_get_contents($target);
-$contents = preg_replace('{private \$whitelist = \[(.+?)\];}sm', "private \$whitelist = [\n        '".implode("',\n        '", UnusedTagsPassUtils::getDefinedTags())."',\n    ];", $contents);
+$contents = preg_replace('{private \$knownTags = \[(.+?)\];}sm', "private \$knownTags = [\n        '".implode("',\n        '", UnusedTagsPassUtils::getDefinedTags())."',\n    ];", $contents);
 file_put_contents($target, $contents);
diff --git a/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php b/Tests/DependencyInjection/Compiler/UnusedTagsPassTest.php
@@ -32,21 +32,21 @@ public function testProcess()
         $this->assertSame([sprintf('%s: Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?', UnusedTagsPass::class)], $container->getCompiler()->getLog());
     }
 
-    public function testMissingWhitelistTags()
+    public function testMissingKnownTags()
     {
         if (\dirname((new \ReflectionClass(ContainerBuilder::class))->getFileName(), 3) !== \dirname(__DIR__, 5)) {
             $this->markTestSkipped('Tests are not run from the root symfony/symfony metapackage.');
         }
 
-        $this->assertSame(UnusedTagsPassUtils::getDefinedTags(), $this->getWhitelistTags(), 'The src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php file must be updated; run src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-tags-whitelist.php.');
+        $this->assertSame(UnusedTagsPassUtils::getDefinedTags(), $this->getKnownTags(), 'The src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php file must be updated; run src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-known-tags.php.');
     }
 
     private function getWhitelistTags(): array
     {
         // get tags in UnusedTagsPass
         $target = \dirname(__DIR__, 3).'/DependencyInjection/Compiler/UnusedTagsPass.php';
         $contents = file_get_contents($target);
-        preg_match('{private \$whitelist = \[(.+?)\];}sm', $contents, $matches);
+        preg_match('{private \$knownTags = \[(.+?)\];}sm', $contents, $matches);
         $tags = array_values(array_filter(array_map(function ($str) {
             return trim(preg_replace('{^ +\'(.+)\',}', '$1', $str));
         }, explode("\n", $matches[1]))));

Original file line number	Diff line number	Diff line change
`@@ -32,21 +32,21 @@ public function testProcess()`
`32`	`32`	`$this->assertSame([sprintf('%s: Tag "kenrel.event_subscriber" was defined on service(s) "foo", "bar", but was never used. Did you mean "kernel.event_subscriber"?', UnusedTagsPass::class)], $container->getCompiler()->getLog());`
`33`	`33`	`}`
`34`	`34`
`35`		`- public function testMissingWhitelistTags()`
	`35`	`+ public function testMissingKnownTags()`
`36`	`36`	`{`
`37`	`37`	`if (\dirname((new \ReflectionClass(ContainerBuilder::class))->getFileName(), 3) !== \dirname(__DIR__, 5)) {`
`38`	`38`	`$this->markTestSkipped('Tests are not run from the root symfony/symfony metapackage.');`
`39`	`39`	`}`
`40`	`40`
`41`		`- $this->assertSame(UnusedTagsPassUtils::getDefinedTags(), $this->getWhitelistTags(), 'The src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php file must be updated; run src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-tags-whitelist.php.');`
	`41`	`+ $this->assertSame(UnusedTagsPassUtils::getDefinedTags(), $this->getKnownTags(), 'The src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/UnusedTagsPass.php file must be updated; run src/Symfony/Bundle/FrameworkBundle/Resources/bin/check-unused-known-tags.php.');`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`private function getWhitelistTags(): array`
`45`	`45`	`{`
`46`	`46`	`// get tags in UnusedTagsPass`
`47`	`47`	`$target = \dirname(__DIR__, 3).'/DependencyInjection/Compiler/UnusedTagsPass.php';`
`48`	`48`	`$contents = file_get_contents($target);`
`49`		`- preg_match('{private \$whitelist = \[(.+?)\];}sm', $contents, $matches);`
	`49`	`+ preg_match('{private \$knownTags = \[(.+?)\];}sm', $contents, $matches);`
`50`	`50`	`$tags = array_values(array_filter(array_map(function ($str) {`
`51`	`51`	`return trim(preg_replace('{^ +\'(.+)\',}', '$1', $str));`
`52`	`52`	`}, explode("\n", $matches[1]))));`