Merge branch '4.4' into 5.2

* 4.4:
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis

Author: nicolas-grekas

Controller/ControllerResolver.php

@@ -26,11 +26,8 @@ class ControllerResolver extends ContainerControllerResolver
      */
     protected function instantiateController($class): object
     {
-        return $this->configureController(parent::instantiateController($class), $class);
-    }
+        $controller = parent::instantiateController($class);
 
-    private function configureController($controller, string $class): object
-    {
         if ($controller instanceof ContainerAwareInterface) {
             $controller->setContainer($this->container);
         }

DataCollector/RouterDataCollector.php

@@ -16,8 +16,6 @@
 use Symfony\Component\HttpKernel\DataCollector\RouterDataCollector as BaseRouterDataCollector;
 
 /**
- * RouterDataCollector.
- *
  * @author Fabien Potencier <[email protected]>
  *
  * @final

Routing/AnnotatedRouteControllerLoader.php

@@ -25,7 +25,7 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
     /**
      * Configures the _controller default parameter of a given Route instance.
      *
-     * @param mixed $annot The annotation class instance
+     * @param object $annot The annotation class instance
      */
     protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)
     {

Translation/Translator.php

@@ -20,8 +20,6 @@
 use Symfony\Component\Translation\Translator as BaseTranslator;
 
 /**
- * Translator.
- *
  * @author Fabien Potencier <[email protected]>
  */
 class Translator extends BaseTranslator implements WarmableInterface