Merge branch '5.2' into 5.3

nicolas-grekas · nicolas-grekas · commit 178104873574 · 2021-07-02T18:38:59.000+02:00
* 5.2:
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis
diff --git a/CacheWarmer/CachePoolClearerCacheWarmer.php b/CacheWarmer/CachePoolClearerCacheWarmer.php
@@ -39,7 +39,7 @@ public function __construct(Psr6CacheClearer $poolClearer, array $pools = [])
      *
      * @return string[]
      */
-    public function warmUp($cacheDirectory): array
+    public function warmUp(string $cacheDirectory): array
     {
         foreach ($this->pools as $pool) {
             if ($this->poolClearer->hasPool($pool)) {
diff --git a/Console/Application.php b/Console/Application.php
@@ -109,7 +109,7 @@ protected function doRunCommand(Command $command, InputInterface $input, OutputI
     /**
      * {@inheritdoc}
      */
-    public function find($name)
+    public function find(string $name)
     {
         $this->registerCommands();
 
@@ -119,7 +119,7 @@ public function find($name)
     /**
      * {@inheritdoc}
      */
-    public function get($name)
+    public function get(string $name)
     {
         $this->registerCommands();
 
@@ -135,7 +135,7 @@ public function get($name)
     /**
      * {@inheritdoc}
      */
-    public function all($namespace = null)
+    public function all(string $namespace = null)
     {
         $this->registerCommands();
 
diff --git a/Console/Descriptor/Descriptor.php b/Console/Descriptor/Descriptor.php
@@ -113,7 +113,7 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr
      *
      * @param Definition|Alias|object $service
      */
-    abstract protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null);
+    abstract protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null);
 
     /**
      * Describes container services.
diff --git a/Console/Descriptor/JsonDescriptor.php b/Console/Descriptor/JsonDescriptor.php
@@ -67,7 +67,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
         $this->writeData($data, $options);
     }
 
-    protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
diff --git a/Console/Descriptor/MarkdownDescriptor.php b/Console/Descriptor/MarkdownDescriptor.php
@@ -88,7 +88,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
         }
     }
 
-    protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
diff --git a/Console/Descriptor/TextDescriptor.php b/Console/Descriptor/TextDescriptor.php
@@ -141,7 +141,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
         }
     }
 
-    protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
diff --git a/Console/Descriptor/XmlDescriptor.php b/Console/Descriptor/XmlDescriptor.php
@@ -53,7 +53,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio
         $this->writeDocument($this->getContainerTagsDocument($builder, isset($options['show_hidden']) && $options['show_hidden']));
     }
 
-    protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)
+    protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)
     {
         if (!isset($options['id'])) {
             throw new \InvalidArgumentException('An "id" option must be provided.');
@@ -255,7 +255,7 @@ private function getContainerTagsDocument(ContainerBuilder $builder, bool $showH
         return $dom;
     }
 
-    private function getContainerServiceDocument($service, string $id, ContainerBuilder $builder = null, bool $showArguments = false): \DOMDocument
+    private function getContainerServiceDocument(object $service, string $id, ContainerBuilder $builder = null, bool $showArguments = false): \DOMDocument
     {
         $dom = new \DOMDocument('1.0', 'UTF-8');
 
diff --git a/Controller/AbstractController.php b/Controller/AbstractController.php
@@ -428,7 +428,7 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool
      *
      * @param object|Envelope $message The message or the message pre-wrapped in an envelope
      */
-    protected function dispatchMessage($message, array $stamps = []): Envelope
+    protected function dispatchMessage(object $message, array $stamps = []): Envelope
     {
         if (!$this->container->has('messenger.default_bus')) {
             $message = class_exists(Envelope::class) ? 'You need to define the "messenger.default_bus" configuration option.' : 'Try running "composer require symfony/messenger".';
diff --git a/Controller/ControllerResolver.php b/Controller/ControllerResolver.php
@@ -24,13 +24,10 @@ class ControllerResolver extends ContainerControllerResolver
     /**
      * {@inheritdoc}
      */
-    protected function instantiateController($class): object
+    protected function instantiateController(string $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);
         }
diff --git a/DataCollector/RouterDataCollector.php b/DataCollector/RouterDataCollector.php
@@ -16,8 +16,6 @@
 use Symfony\Component\HttpKernel\DataCollector\RouterDataCollector as BaseRouterDataCollector;
 
 /**
- * RouterDataCollector.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  *
  * @final
diff --git a/KernelBrowser.php b/KernelBrowser.php
@@ -112,7 +112,7 @@ public function enableReboot()
     /**
      * @param UserInterface $user
      */
-    public function loginUser($user, string $firewallContext = 'main'): self
+    public function loginUser(object $user, string $firewallContext = 'main'): self
     {
         if (!interface_exists(UserInterface::class)) {
             throw new \LogicException(sprintf('"%s" requires symfony/security-core to be installed.', __METHOD__));
diff --git a/Routing/AnnotatedRouteControllerLoader.php b/Routing/AnnotatedRouteControllerLoader.php
@@ -24,10 +24,8 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
 {
     /**
      * Configures the _controller default parameter of a given Route instance.
-     *
-     * @param mixed $annot The annotation class instance
      */
-    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot)
+    protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot)
     {
         if ('__invoke' === $method->getName()) {
             $route->setDefault('_controller', $class->getName());
diff --git a/Test/BrowserKitAssertionsTrait.php b/Test/BrowserKitAssertionsTrait.php
@@ -117,7 +117,7 @@ public static function assertRequestAttributeValueSame(string $name, string $exp
         self::assertThat(self::getRequest(), new ResponseConstraint\RequestAttributeValueSame($name, $expectedValue), $message);
     }
 
-    public static function assertRouteSame($expectedRoute, array $parameters = [], string $message = ''): void
+    public static function assertRouteSame(string $expectedRoute, array $parameters = [], string $message = ''): void
     {
         $constraint = new ResponseConstraint\RequestAttributeValueSame('_route', $expectedRoute);
         $constraints = [];
diff --git a/Translation/Translator.php b/Translation/Translator.php
@@ -20,8 +20,6 @@
 use Symfony\Component\Translation\Translator as BaseTranslator;
 
 /**
- * Translator.
- *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class Translator extends BaseTranslator implements WarmableInterface

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public function __construct(Psr6CacheClearer $poolClearer, array $pools = [])`
`39`	`39`	`*`
`40`	`40`	`* @return string[]`
`41`	`41`	`*/`
`42`		`- public function warmUp($cacheDirectory): array`
	`42`	`+ public function warmUp(string $cacheDirectory): array`
`43`	`43`	`{`
`44`	`44`	`foreach ($this->pools as $pool) {`
`45`	`45`	`if ($this->poolClearer->hasPool($pool)) {`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ abstract protected function describeContainerTags(ContainerBuilder $builder, arr`
`113`	`113`	`*`
`114`	`114`	`* @param Definition\|Alias\|object $service`
`115`	`115`	`*/`
`116`		`- abstract protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null);`
	`116`	`+ abstract protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null);`
`117`	`117`
`118`	`118`	`/**`
`119`	`119`	`* Describes container services.`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio`
`67`	`67`	`$this->writeData($data, $options);`
`68`	`68`	`}`
`69`	`69`
`70`		`- protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)`
	`70`	`+ protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)`
`71`	`71`	`{`
`72`	`72`	`if (!isset($options['id'])) {`
`73`	`73`	`throw new \InvalidArgumentException('An "id" option must be provided.');`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio`
`88`	`88`	`}`
`89`	`89`	`}`
`90`	`90`
`91`		`- protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)`
	`91`	`+ protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)`
`92`	`92`	`{`
`93`	`93`	`if (!isset($options['id'])) {`
`94`	`94`	`throw new \InvalidArgumentException('An "id" option must be provided.');`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio`
`141`	`141`	`}`
`142`	`142`	`}`
`143`	`143`
`144`		`- protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)`
	`144`	`+ protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)`
`145`	`145`	`{`
`146`	`146`	`if (!isset($options['id'])) {`
`147`	`147`	`throw new \InvalidArgumentException('An "id" option must be provided.');`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ protected function describeContainerTags(ContainerBuilder $builder, array $optio`
`53`	`53`	`$this->writeDocument($this->getContainerTagsDocument($builder, isset($options['show_hidden']) && $options['show_hidden']));`
`54`	`54`	`}`
`55`	`55`
`56`		`- protected function describeContainerService($service, array $options = [], ContainerBuilder $builder = null)`
	`56`	`+ protected function describeContainerService(object $service, array $options = [], ContainerBuilder $builder = null)`
`57`	`57`	`{`
`58`	`58`	`if (!isset($options['id'])) {`
`59`	`59`	`throw new \InvalidArgumentException('An "id" option must be provided.');`
`@@ -255,7 +255,7 @@ private function getContainerTagsDocument(ContainerBuilder $builder, bool $showH`
`255`	`255`	`return $dom;`
`256`	`256`	`}`
`257`	`257`
`258`		`- private function getContainerServiceDocument($service, string $id, ContainerBuilder $builder = null, bool $showArguments = false): \DOMDocument`
	`258`	`+ private function getContainerServiceDocument(object $service, string $id, ContainerBuilder $builder = null, bool $showArguments = false): \DOMDocument`
`259`	`259`	`{`
`260`	`260`	`$dom = new \DOMDocument('1.0', 'UTF-8');`
`261`	`261`
Original file line number	Diff line number	Diff line change
`@@ -428,7 +428,7 @@ protected function isCsrfTokenValid(string $id, ?string $token): bool`
`428`	`428`	`*`
`429`	`429`	`* @param object\|Envelope $message The message or the message pre-wrapped in an envelope`
`430`	`430`	`*/`
`431`		`- protected function dispatchMessage($message, array $stamps = []): Envelope`
	`431`	`+ protected function dispatchMessage(object $message, array $stamps = []): Envelope`
`432`	`432`	`{`
`433`	`433`	`if (!$this->container->has('messenger.default_bus')) {`
`434`	`434`	`$message = class_exists(Envelope::class) ? 'You need to define the "messenger.default_bus" configuration option.' : 'Try running "composer require symfony/messenger".';`
Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,6 @@`
`16`	`16`	`use Symfony\Component\HttpKernel\DataCollector\RouterDataCollector as BaseRouterDataCollector;`
`17`	`17`
`18`	`18`	`/**`
`19`		`- * RouterDataCollector.`
`20`		`- *`
`21`	`19`	`* @author Fabien Potencier <fabien@symfony.com>`
`22`	`20`	`*`
`23`	`21`	`* @final`