minor #33252 Fix inconsistent return points (derrabus)

This PR was merged into the 3.4 branch. Discussion ---------- Fix inconsistent return points | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #17201 in preparation for #33228 | License | MIT | Doc PR | N/A Inconsistent return points in methods prevent adding return types. I thought, I'll give it a try and fix them. After this PR, PhpStorm's inspection still finds 39 issues, but as far as I can tell, they're either false positives or fixture code. Commits ------- f5b6ee9 Fix inconsistent return points.
symfony · Aug 20, 2019 · 8069b58 · 8069b58
2 parents 55a484d + f5b6ee9
commit 8069b58
Show file tree

Hide file tree

Showing 131 changed files with 420 additions and 210 deletions.
diff --git a/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php b/src/Symfony/Bridge/Doctrine/ExpressionLanguage/DoctrineParserCache.php
@@ -37,7 +37,7 @@ public function __construct(Cache $cache)
     public function fetch($key)
     {
         if (false === $value = $this->cache->fetch($key)) {
-            return;
+            return null;
         }
 
         return $value;

diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -118,6 +118,8 @@ public function guessRequired($class, $property)
 
             return new ValueGuess(!$mapping['joinColumns'][0]['nullable'], Guess::HIGH_CONFIDENCE);
         }
+
+        return null;
     }
 
     /**
@@ -137,6 +139,8 @@ public function guessMaxLength($class, $property)
                 return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
             }
         }
+
+        return null;
     }
 
     /**
@@ -150,6 +154,8 @@ public function guessPattern($class, $property)
                 return new ValueGuess(null, Guess::MEDIUM_CONFIDENCE);
             }
         }
+
+        return null;
     }
 
     protected function getMetadata($class)
@@ -171,5 +177,7 @@ protected function getMetadata($class)
                 // not an entity or mapped super class, using Doctrine ORM 2.2
             }
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php b/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
@@ -157,6 +157,8 @@ public function configureOptions(OptionsResolver $resolver)
 
                 return $doctrineChoiceLoader;
             }
+
+            return null;
         };
 
         $choiceName = function (Options $options) {
@@ -171,6 +173,7 @@ public function configureOptions(OptionsResolver $resolver)
             }
 
             // Otherwise, an incrementing integer is used as name automatically
+            return null;
         };
 
         // The choices are always indexed by ID (see "choices" normalizer
@@ -187,6 +190,7 @@ public function configureOptions(OptionsResolver $resolver)
             }
 
             // Otherwise, an incrementing integer is used as value automatically
+            return null;
         };
 
         $emNormalizer = function (Options $options, $em) {

diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
@@ -248,6 +248,8 @@ private function getMergeSql()
                 return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
                     "ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->timeCol)";
         }
+
+        return null;
     }
 
     private function getServerVersion()

diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -42,9 +42,9 @@ public function getProperties($class, array $context = [])
         try {
             $metadata = $this->classMetadataFactory->getMetadataFor($class);
         } catch (MappingException $exception) {
-            return;
+            return null;
         } catch (OrmMappingException $exception) {
-            return;
+            return null;
         }
 
         $properties = array_merge($metadata->getFieldNames(), $metadata->getAssociationNames());
@@ -68,9 +68,9 @@ public function getTypes($class, $property, array $context = [])
         try {
             $metadata = $this->classMetadataFactory->getMetadataFor($class);
         } catch (MappingException $exception) {
-            return;
+            return null;
         } catch (OrmMappingException $exception) {
-            return;
+            return null;
         }
 
         if ($metadata->hasAssociation($property)) {
@@ -162,6 +162,8 @@ public function getTypes($class, $property, array $context = [])
                     return $builtinType ? [new Type($builtinType, $nullable)] : null;
             }
         }
+
+        return null;
     }
 
     /**
@@ -225,5 +227,7 @@ private function getPhpType($doctrineType)
             case DBALType::OBJECT:
                 return Type::BUILTIN_TYPE_OBJECT;
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineFooType.php
@@ -47,7 +47,7 @@ public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $pla
     public function convertToDatabaseValue($value, AbstractPlatform $platform)
     {
         if (null === $value) {
-            return;
+            return null;
         }
         if (!$value instanceof Foo) {
             throw new ConversionException(sprintf('Expected %s, got %s', 'Symfony\Bridge\Doctrine\Tests\PropertyInfo\Fixtures\Foo', \gettype($value)));
@@ -62,7 +62,7 @@ public function convertToDatabaseValue($value, AbstractPlatform $platform)
     public function convertToPHPValue($value, AbstractPlatform $platform)
     {
         if (null === $value) {
-            return;
+            return null;
         }
         if (!\is_string($value)) {
             throw ConversionException::conversionFailed($value, self::NAME);

diff --git a/src/Symfony/Bridge/PhpUnit/ClockMock.php b/src/Symfony/Bridge/PhpUnit/ClockMock.php
@@ -25,6 +25,8 @@ public static function withClockMock($enable = null)
         }
 
         self::$now = is_numeric($enable) ? (float) $enable : ($enable ? microtime(true) : null);
+
+        return null;
     }
 
     public static function time()
@@ -54,6 +56,8 @@ public static function usleep($us)
         }
 
         self::$now += $us / 1000000;
+
+        return null;
     }
 
     public static function microtime($asFloat = false)

diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -180,6 +180,8 @@ public static function register($mode = 0)
                 ++$ref;
             }
             ++$deprecations[$group.'Count'];
+
+            return null;
         };
         $oldErrorHandler = set_error_handler($deprecationHandler);
 
@@ -291,6 +293,8 @@ public static function collectDeprecations($outputFile)
                 return \call_user_func(DeprecationErrorHandler::getPhpUnitErrorHandler(), $type, $msg, $file, $line, $context);
             }
             $deprecations[] = array(error_reporting(), $msg, $file);
+
+            return null;
         });
 
         register_shutdown_function(function () use ($outputFile, &$deprecations) {

diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/CoverageListenerTrait.php
@@ -95,11 +95,7 @@ private function findSutFqcn($test)
         $sutFqcn = str_replace('\\Tests\\', '\\', $class);
         $sutFqcn = preg_replace('{Test$}', '', $sutFqcn);
 
-        if (!class_exists($sutFqcn)) {
-            return;
-        }
-
-        return $sutFqcn;
+        return class_exists($sutFqcn) ? $sutFqcn : null;
     }
 
     public function __destruct()

diff --git a/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php b/src/Symfony/Bridge/PhpUnit/Legacy/SymfonyTestsListenerTrait.php
@@ -357,6 +357,8 @@ public function handleError($type, $msg, $file, $line, $context = array())
             $msg = 'Unsilenced deprecation: '.$msg;
         }
         $this->gatheredDeprecations[] = $msg;
+
+        return null;
     }
 
     /**

diff --git a/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit b/src/Symfony/Bridge/PhpUnit/bin/simple-phpunit
@@ -135,7 +135,7 @@ $argv = isset($_SERVER['argv']) ? $_SERVER['argv'] : array();
 $argc = isset($_SERVER['argc']) ? $_SERVER['argc'] : 0;
 
 if ($PHPUNIT_VERSION < 8.0) {
-    $argv = array_filter($argv, function ($v) use (&$argc) { if ('--do-not-cache-result' !== $v) return true; --$argc; });
+    $argv = array_filter($argv, function ($v) use (&$argc) { if ('--do-not-cache-result' !== $v) return true; --$argc; return false; });
 } elseif (filter_var(getenv('SYMFONY_PHPUNIT_DISABLE_RESULT_CACHE'), FILTER_VALIDATE_BOOLEAN)) {
     $argv[] = '--do-not-cache-result';
     ++$argc;

diff --git a/src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php b/src/Symfony/Bridge/ProxyManager/Legacy/ProxiedMethodReturnExpression.php
@@ -46,7 +46,7 @@ public static function generate(string $returnedValueExpression, ?\ReflectionMet
             $functionLoader = $functionLoader[0];
         }
         if (!\is_object($functionLoader)) {
-            return;
+            return null;
         }
         if ($functionLoader instanceof ClassLoader) {
             return $functionLoader;
@@ -57,6 +57,8 @@ public static function generate(string $returnedValueExpression, ?\ReflectionMet
         if ($functionLoader instanceof \Symfony\Component\ErrorHandler\DebugClassLoader) {
             return $getComposerClassLoader($functionLoader->getClassLoader());
         }
+
+        return null;
     };
 
     $classLoader = null;

diff --git a/src/Symfony/Bridge/Twig/AppVariable.php b/src/Symfony/Bridge/Twig/AppVariable.php
@@ -83,9 +83,8 @@ public function getUser()
         }
 
         $user = $token->getUser();
-        if (\is_object($user)) {
-            return $user;
-        }
+
+        return \is_object($user) ? $user : null;
     }
 
     /**
@@ -113,9 +112,7 @@ public function getSession()
             throw new \RuntimeException('The "app.session" variable is not available.');
         }
 
-        if ($request = $this->getRequest()) {
-            return $request->getSession();
-        }
+        return ($request = $this->getRequest()) ? $request->getSession() : null;
     }
 
     /**

diff --git a/src/Symfony/Bridge/Twig/Command/DebugCommand.php b/src/Symfony/Bridge/Twig/Command/DebugCommand.php
@@ -220,16 +220,16 @@ private function getMetadata($type, $entity)
             return $entity;
         }
         if ('tests' === $type) {
-            return;
+            return null;
         }
         if ('functions' === $type || 'filters' === $type) {
             $cb = $entity->getCallable();
             if (null === $cb) {
-                return;
+                return null;
             }
             if (\is_array($cb)) {
                 if (!method_exists($cb[0], $cb[1])) {
-                    return;
+                    return null;
                 }
                 $refl = new \ReflectionMethod($cb[0], $cb[1]);
             } elseif (\is_object($cb) && method_exists($cb, '__invoke')) {
@@ -268,6 +268,8 @@ private function getMetadata($type, $entity)
 
             return $args;
         }
+
+        return null;
     }
 
     private function getPrettyMetadata($type, $entity, $decorated)
@@ -302,5 +304,7 @@ private function getPrettyMetadata($type, $entity, $decorated)
         if ('filters' === $type) {
             return $meta ? '('.implode(', ', $meta).')' : '';
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bridge/Twig/Extension/DumpExtension.php b/src/Symfony/Bridge/Twig/Extension/DumpExtension.php
@@ -55,7 +55,7 @@ public function getName()
     public function dump(Environment $env, $context)
     {
         if (!$env->isDebug()) {
-            return;
+            return null;
         }
 
         if (2 === \func_num_args()) {

diff --git a/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php b/src/Symfony/Bridge/Twig/NodeVisitor/TranslationNodeVisitor.php
@@ -115,7 +115,7 @@ private function getReadDomainFromArguments(Node $arguments, $index)
         } elseif ($arguments->hasNode($index)) {
             $argument = $arguments->getNode($index);
         } else {
-            return;
+            return null;
         }
 
         return $this->getReadDomainFromNode($argument);

diff --git a/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php b/src/Symfony/Bridge/Twig/UndefinedCallableHandler.php
@@ -71,6 +71,8 @@ public static function onUndefinedFilter($name)
         }
 
         self::onUndefined($name, 'filter', self::$filterComponents[$name]);
+
+        return true;
     }
 
     public static function onUndefinedFunction($name)
@@ -80,6 +82,8 @@ public static function onUndefinedFunction($name)
         }
 
         self::onUndefined($name, 'function', self::$functionComponents[$name]);
+
+        return true;
     }
 
     private static function onUndefined($name, $type, $component)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
@@ -86,7 +86,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 'For dumping a specific option, add its path as the second argument of this command. (e.g. <comment>config:dump-reference FrameworkBundle profiler.matcher</comment> to dump the <comment>framework.profiler.matcher</comment> configuration)',
             ]);
 
-            return;
+            return null;
         }
 
         $extension = $this->findExtension($name);
@@ -129,5 +129,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $io->writeln(null === $path ? $dumper->dump($configuration, $extension->getNamespace()) : $dumper->dumpAtPath($configuration, $path));
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -93,5 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $io->table([], $tableRows);
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -154,10 +154,13 @@ private function convertController(Route $route)
         }
     }
 
+    /**
+     * @return callable|null
+     */
     private function extractCallable(Route $route)
     {
         if (!$route->hasDefault('_controller')) {
-            return;
+            return null;
         }
 
         $controller = $route->getDefault('_controller');
@@ -178,5 +181,7 @@ private function extractCallable(Route $route)
             return $controller;
         } catch (\InvalidArgumentException $e) {
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
@@ -149,5 +149,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             return 1;
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -242,7 +242,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if (!\count($operation->getDomains())) {
             $errorIo->warning('No translation messages were found.');
 
-            return;
+            return null;
         }
 
         $resultMessage = 'Translation files were successfully updated';
@@ -307,6 +307,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $errorIo->success($resultMessage.'.');
+
+        return null;
     }
 
     private function filterCatalogue(MessageCatalogue $catalogue, $domain)