Remove wrong deprecation triggers for forms in the DI extension

When a form type provides a BC layer with old form names (all core types
do), the form registry will ask for type extensions registered on the
legacy name for BC, and trigger a warning if it finds any.
The DependencyInjectionExtension should not trigger warnings on its own
when being asked for such extensions (especially when it has none
registered).
Core extensions are also registered using the proper extended type
rather than legacy names.

Author: stof

Extension/DependencyInjection/DependencyInjectionExtension.php

@@ -22,19 +22,17 @@ class DependencyInjectionExtension implements FormExtensionInterface
     private $typeServiceIds;
     private $typeExtensionServiceIds;
     private $guesserServiceIds;
-    private $legacyNames;
     private $guesser;
     private $guesserLoaded = false;
 
     public function __construct(ContainerInterface $container,
         array $typeServiceIds, array $typeExtensionServiceIds,
-        array $guesserServiceIds, array $legacyNames = array())
+        array $guesserServiceIds)
     {
         $this->container = $container;
         $this->typeServiceIds = $typeServiceIds;
         $this->typeExtensionServiceIds = $typeExtensionServiceIds;
         $this->guesserServiceIds = $guesserServiceIds;
-        $this->legacyNames = $legacyNames;
     }
 
     public function getType($name)
@@ -43,14 +41,10 @@ public function getType($name)
             throw new InvalidArgumentException(sprintf('The field type "%s" is not registered with the service container.', $name));
         }
 
-        if (isset($this->legacyNames[$name])) {
-            @trigger_error('Accessing form types by type name/service ID is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead.', E_USER_DEPRECATED);
-        }
-
         $type = $this->container->get($this->typeServiceIds[$name]);
 
         // BC: validate result of getName() for legacy names (non-FQCN)
-        if (isset($this->legacyNames[$name]) && $type->getName() !== $name) {
+        if ($name !== get_class($type) && $type->getName() !== $name) {
             throw new InvalidArgumentException(
                 sprintf('The type name specified for the service "%s" does not match the actual name. Expected "%s", given "%s"',
                     $this->typeServiceIds[$name],
@@ -65,23 +59,11 @@ public function getType($name)
 
     public function hasType($name)
     {
-        if (isset($this->typeServiceIds[$name])) {
-            if (isset($this->legacyNames[$name])) {
-                @trigger_error('Accessing form types by type name/service ID is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead.', E_USER_DEPRECATED);
-            }
-
-            return true;
-        }
-
-        return false;
+        return isset($this->typeServiceIds[$name]);
     }
 
     public function getTypeExtensions($name)
     {
-        if (isset($this->legacyNames[$name])) {
-            @trigger_error('Accessing form types by type name/service ID is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead.', E_USER_DEPRECATED);
-        }
-
         $extensions = array();
 
         if (isset($this->typeExtensionServiceIds[$name])) {
@@ -95,10 +77,6 @@ public function getTypeExtensions($name)
 
     public function hasTypeExtensions($name)
     {
-        if (isset($this->legacyNames[$name])) {
-            @trigger_error('Accessing form types by type name/service ID is deprecated since version 2.8 and will not be supported in 3.0. Use the fully-qualified type class name instead.', E_USER_DEPRECATED);
-        }
-
         return isset($this->typeExtensionServiceIds[$name]);
     }