Merge branch '4.4' into 5.0

* 4.4: (23 commits)
  [Filesystem] Handle paths on different drives
  [WebProfiler] Do not add src-elem CSP directives if they do not exist
  [Yaml] fix parse error when unindented collections contain a comment
  Execute docker dependent tests with github actions
  Update exception.html.php
  [3.4][Inflector] Improve testSingularize() argument name
  [Inflector] Fix testPluralize() arguments names
  [PhpUnitBridge] fix PHP 5.3 compat again
  Skip validation when email is an empty object
  fix sr_Latn translation
  [Validator] fix lazy property usage.
  Fix annotation
  [Debug][ErrorHandler] cleanup phpunit.xml.dist files
  [Translation] Fix for translation:update command updating ICU messages
  [PhpUnitBridge] fix compat with PHP 5.3
  bumped Symfony version to 4.4.9
  updated VERSION for 4.4.8
  updated CHANGELOG for 4.4.8
  provide a useful message when extension types don't match
  [Cache] Fixed not supported Redis eviction policies
  ...

Author: nicolas-grekas

Extension/DependencyInjection/DependencyInjectionExtension.php

@@ -62,7 +62,7 @@ public function getTypeExtensions(string $name)
         $extensions = [];
 
         if (isset($this->typeExtensionServices[$name])) {
-            foreach ($this->typeExtensionServices[$name] as $serviceId => $extension) {
+            foreach ($this->typeExtensionServices[$name] as $extension) {
                 $extensions[] = $extension;
 
                 $extendedTypes = [];
@@ -72,7 +72,7 @@ public function getTypeExtensions(string $name)
 
                 // validate the result of getExtendedTypes() to ensure it is consistent with the service definition
                 if (!\in_array($name, $extendedTypes, true)) {
-                    throw new InvalidArgumentException(sprintf('The extended type specified for the service "%s" does not match the actual extended type. Expected "%s", given "%s".', $serviceId, $name, implode(', ', $extendedTypes)));
+                    throw new InvalidArgumentException(sprintf('The extended type "%s" specified for the type extension class "%s" does not match any of the actual extended types (["%s"]).', $name, \get_class($extension), implode('", "', $extendedTypes)));
                 }
             }
         }

Form.php

@@ -958,7 +958,7 @@ public function offsetExists($name)
      *
      * @return FormInterface The child form
      *
-     * @throws \OutOfBoundsException if the named child does not exist
+     * @throws OutOfBoundsException if the named child does not exist
      */
     public function offsetGet($name)
     {

FormInterface.php

@@ -60,7 +60,7 @@ public function add($child, string $type = null, array $options = []);
      *
      * @return self
      *
-     * @throws \OutOfBoundsException if the named child does not exist
+     * @throws Exception\OutOfBoundsException if the named child does not exist
      */
     public function get(string $name);
 

Tests/Extension/DependencyInjection/DependencyInjectionExtensionTest.php

@@ -44,6 +44,8 @@ public function testGetTypeExtensions()
     public function testThrowExceptionForInvalidExtendedType()
     {
         $this->expectException('Symfony\Component\Form\Exception\InvalidArgumentException');
+        $this->expectExceptionMessage(sprintf('The extended type "unmatched" specified for the type extension class "%s" does not match any of the actual extended types (["test"]).', TestTypeExtension::class));
+
         $extensions = [
             'unmatched' => new \ArrayIterator([new TestTypeExtension()]),
         ];