More return type fixes (bis)

nicolas-grekas · nicolas-grekas · commit c2c9d2e20573 · 2021-08-12T10:32:38.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php b/src/Symfony/Bridge/Doctrine/CacheWarmer/ProxyCacheWarmer.php
@@ -34,7 +34,7 @@ public function __construct(ManagerRegistry $registry)
     /**
      * This cache warmer is not optional, without proxies fatal error occurs!
      *
-     * @return false
+     * @return bool
      */
     public function isOptional()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -49,7 +49,7 @@ public function warmUp(string $cacheDir)
         spl_autoload_register([ClassExistenceResource::class, 'throwOnRequiredClass']);
         try {
             if (!$this->doWarmUp($cacheDir, $arrayAdapter)) {
-                return;
+                return [];
             }
         } finally {
             spl_autoload_unregister([ClassExistenceResource::class, 'throwOnRequiredClass']);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -100,7 +100,7 @@ public function warmUp(string $cacheDir)
     {
         // skip warmUp when translator doesn't use cache
         if (null === $this->options['cache_dir']) {
-            return;
+            return [];
         }
 
         $localesToWarmUp = $this->enabledLocales ?: array_merge($this->getFallbackLocales(), [$this->getLocale()], $this->resourceLocales);
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -84,7 +84,7 @@ private function init($redis, string $namespace, int $defaultLifetime, ?Marshall
      *
      * @param array $options See self::$defaultConnectionOptions
      *
-     * @return \Redis|\RedisCluster|RedisClusterProxy|RedisProxy|\Predis\ClientInterface According to the "class" option
+     * @return \Redis|\RedisArray|\RedisCluster|RedisClusterProxy|RedisProxy|\Predis\ClientInterface According to the "class" option
      *
      * @throws InvalidArgumentException when the DSN is invalid
      */
diff --git a/src/Symfony/Component/DependencyInjection/Definition.php b/src/Symfony/Component/DependencyInjection/Definition.php
@@ -812,7 +812,7 @@ public function setConfigurator($configurator)
     /**
      * Gets the configurator to call after the service is fully initialized.
      *
-     * @return callable|array|null
+     * @return string|array|null
      */
     public function getConfigurator()
     {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php b/src/Symfony/Component/DependencyInjection/Loader/ClosureLoader.php
@@ -36,7 +36,7 @@ public function __construct(ContainerBuilder $container, string $env = null)
      */
     public function load($resource, string $type = null)
     {
-        $resource($this->container, $this->env);
+        return $resource($this->container, $this->env);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php b/src/Symfony/Component/DependencyInjection/Loader/DirectoryLoader.php
@@ -38,6 +38,8 @@ public function load($file, string $type = null)
                 $this->import($dir, null, false, $path);
             }
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -63,7 +63,7 @@ public function import($resource, string $type = null, $ignoreErrors = false, st
         }
 
         try {
-            parent::import(...$args);
+            return parent::import(...$args);
         } catch (LoaderLoadException $e) {
             if (!$ignoreNotFound || !($prev = $e->getPrevious()) instanceof FileLocatorFileNotFoundException) {
                 throw $e;
@@ -79,6 +79,8 @@ public function import($resource, string $type = null, $ignoreErrors = false, st
                 throw $e;
             }
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/GlobFileLoader.php
@@ -28,6 +28,8 @@ public function load($resource, string $type = null)
         }
 
         $this->container->addResource($globResource);
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
@@ -50,6 +50,8 @@ public function load($resource, string $type = null)
                 $this->container->setParameter($key, $this->phpize($value));
             }
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/PhpFileLoader.php
@@ -70,6 +70,8 @@ public function load($resource, string $type = null)
             $this->instanceof = [];
             $this->registerAliasesForSinglyImplementedInterfaces();
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -66,6 +66,8 @@ public function load($resource, string $type = null)
                 }
             }
         }
+
+        return null;
     }
 
     private function loadXml(\DOMDocument $xml, string $path, \DOMNode $root = null): void
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -126,7 +126,7 @@ public function load($resource, string $type = null)
 
         // empty file
         if (null === $content) {
-            return;
+            return null;
         }
 
         $this->loadContent($content, $path);
@@ -145,6 +145,8 @@ public function load($resource, string $type = null)
                 $this->env = $env;
             }
         }
+
+        return null;
     }
 
     private function loadContent(array $content, string $path)
diff --git a/src/Symfony/Component/HttpKernel/Tests/KernelTest.php b/src/Symfony/Component/HttpKernel/Tests/KernelTest.php
@@ -522,7 +522,7 @@ public function getNamespace(): string
             }
 
             /**
-             * @return false
+             * @return string|false
              */
             public function getXsdValidationBasePath()
             {
diff --git a/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php b/src/Symfony/Component/Ldap/Tests/Security/CheckLdapCredentialsListenerTest.php
@@ -147,7 +147,12 @@ public function testBindFailureShouldThrowAnException()
 
     public function testQueryForDn()
     {
-        $collection = new \ArrayIterator([new Entry('')]);
+        $collection = new class([new Entry('')]) extends \ArrayObject implements CollectionInterface {
+            public function toArray(): array
+            {
+                return $this->getArrayCopy();
+            }
+        };
 
         $query = $this->createMock(QueryInterface::class);
         $query->expects($this->once())->method('execute')->willReturn($collection);
diff --git a/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php b/src/Symfony/Component/Routing/Matcher/ExpressionLanguageProvider.php
@@ -34,8 +34,10 @@ public function __construct(ServiceProviderInterface $functions)
      */
     public function getFunctions()
     {
+        $functions = [];
+
         foreach ($this->functions->getProvidedServices() as $function => $type) {
-            yield new ExpressionFunction(
+            $functions[] = new ExpressionFunction(
                 $function,
                 static function (...$args) use ($function) {
                     return sprintf('($context->getParameter(\'_functions\')->get(%s)(%s))', var_export($function, true), implode(', ', $args));
@@ -45,6 +47,8 @@ function ($values, ...$args) use ($function) {
                 }
             );
         }
+
+        return $functions;
     }
 
     public function get(string $function): callable
diff --git a/src/Symfony/Component/Runtime/Tests/phpt/kernel.php b/src/Symfony/Component/Runtime/Tests/phpt/kernel.php
@@ -15,7 +15,7 @@ public function __construct(string $var)
         $this->var = $var;
     }
 
-    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true)
+    public function handle(Request $request, $type = self::MASTER_REQUEST, $catch = true): Response
     {
         return new Response('OK Kernel '.$this->var);
     }
diff --git a/src/Symfony/Component/Security/Http/Authenticator/AbstractAuthenticator.php b/src/Symfony/Component/Security/Http/Authenticator/AbstractAuthenticator.php
@@ -28,8 +28,6 @@ abstract class AbstractAuthenticator implements AuthenticatorInterface
     /**
      * Shortcut to create a PostAuthenticationToken for you, if you don't really
      * care about which authenticated token you're using.
-     *
-     * @return PostAuthenticationToken
      */
     public function createToken(Passport $passport, string $firewallName): TokenInterface
     {
diff --git a/src/Symfony/Component/Security/Http/Authenticator/Passport/PassportTrait.php b/src/Symfony/Component/Security/Http/Authenticator/Passport/PassportTrait.php
@@ -20,6 +20,9 @@ trait PassportTrait
 {
     private $badges = [];
 
+    /**
+     * @return $this
+     */
     public function addBadge(BadgeInterface $badge): PassportInterface
     {
         $this->badges[\get_class($badge)] = $badge;

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function __construct(ManagerRegistry $registry)`
`34`	`34`	`/**`
`35`	`35`	`* This cache warmer is not optional, without proxies fatal error occurs!`
`36`	`36`	`*`
`37`		`- * @return false`
	`37`	`+ * @return bool`
`38`	`38`	`*/`
`39`	`39`	`public function isOptional()`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function warmUp(string $cacheDir)`
`49`	`49`	`spl_autoload_register([ClassExistenceResource::class, 'throwOnRequiredClass']);`
`50`	`50`	`try {`
`51`	`51`	`if (!$this->doWarmUp($cacheDir, $arrayAdapter)) {`
`52`		`- return;`
	`52`	`+ return [];`
`53`	`53`	`}`
`54`	`54`	`} finally {`
`55`	`55`	`spl_autoload_unregister([ClassExistenceResource::class, 'throwOnRequiredClass']);`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function warmUp(string $cacheDir)`
`100`	`100`	`{`
`101`	`101`	`// skip warmUp when translator doesn't use cache`
`102`	`102`	`if (null === $this->options['cache_dir']) {`
`103`		`- return;`
	`103`	`+ return [];`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`$localesToWarmUp = $this->enabledLocales ?: array_merge($this->getFallbackLocales(), [$this->getLocale()], $this->resourceLocales);`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ private function init($redis, string $namespace, int $defaultLifetime, ?Marshall`
`84`	`84`	`*`
`85`	`85`	`* @param array $options See self::$defaultConnectionOptions`
`86`	`86`	`*`
`87`		`- * @return \Redis\|\RedisCluster\|RedisClusterProxy\|RedisProxy\|\Predis\ClientInterface According to the "class" option`
	`87`	`+ * @return \Redis\|\RedisArray\|\RedisCluster\|RedisClusterProxy\|RedisProxy\|\Predis\ClientInterface According to the "class" option`
`88`	`88`	`*`
`89`	`89`	`* @throws InvalidArgumentException when the DSN is invalid`
`90`	`90`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ public function setConfigurator($configurator)`
`812`	`812`	`/**`
`813`	`813`	`* Gets the configurator to call after the service is fully initialized.`
`814`	`814`	`*`
`815`		`- * @return callable\|array\|null`
	`815`	`+ * @return string\|array\|null`
`816`	`816`	`*/`
`817`	`817`	`public function getConfigurator()`
`818`	`818`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(ContainerBuilder $container, string $env = null)`
`36`	`36`	`*/`
`37`	`37`	`public function load($resource, string $type = null)`
`38`	`38`	`{`
`39`		`- $resource($this->container, $this->env);`
	`39`	`+ return $resource($this->container, $this->env);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,8 @@ public function load($file, string $type = null)`
`38`	`38`	`$this->import($dir, null, false, $path);`
`39`	`39`	`}`
`40`	`40`	`}`
	`41`	`+`
	`42`	`+ return null;`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function import($resource, string $type = null, $ignoreErrors = false, st`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`try {`
`66`		`- parent::import(...$args);`
	`66`	`+ return parent::import(...$args);`
`67`	`67`	`} catch (LoaderLoadException $e) {`
`68`	`68`	`if (!$ignoreNotFound \|\| !($prev = $e->getPrevious()) instanceof FileLocatorFileNotFoundException) {`
`69`	`69`	`throw $e;`
`@@ -79,6 +79,8 @@ public function import($resource, string $type = null, $ignoreErrors = false, st`
`79`	`79`	`throw $e;`
`80`	`80`	`}`
`81`	`81`	`}`
	`82`	`+`
	`83`	`+ return null;`
`82`	`84`	`}`
`83`	`85`
`84`	`86`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,8 @@ public function load($resource, string $type = null)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`$this->container->addResource($globResource);`
	`31`	`+`
	`32`	`+ return null;`
`31`	`33`	`}`
`32`	`34`
`33`	`35`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,8 @@ public function load($resource, string $type = null)`
`50`	`50`	`$this->container->setParameter($key, $this->phpize($value));`
`51`	`51`	`}`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ return null;`
`53`	`55`	`}`
`54`	`56`
`55`	`57`	`/**`