Backport type fixes

Author: nicolas-grekas

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)) {

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();
 

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.

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.');

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.');

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.');

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');
 

Controller/AbstractController.php

@@ -396,7 +396,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".';

Controller/ControllerResolver.php

@@ -24,7 +24,7 @@ class ControllerResolver extends ContainerControllerResolver
     /**
      * {@inheritdoc}
      */
-    protected function instantiateController($class): object
+    protected function instantiateController(string $class): object
     {
         $controller = parent::instantiateController($class);
 

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__));

Routing/AnnotatedRouteControllerLoader.php

@@ -24,10 +24,8 @@ class AnnotatedRouteControllerLoader extends AnnotationClassLoader
 {
     /**
      * Configures the _controller default parameter of a given Route instance.
-     *
-     * @param object $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());

Test/BrowserKitAssertionsTrait.php

@@ -112,7 +112,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 = [];