Fix inconsistent return points.

derrabus · nicolas-grekas · commit c26c53596eea · 2019-08-20T16:27:59.000+02:00
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -168,6 +168,8 @@ public function getTypes($class, $property, array $context = [])
                     return $builtinType ? [new Type($builtinType, $nullable)] : null;
             }
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php b/src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
@@ -107,6 +107,8 @@ public static function collectDeprecations($outputFile)
             }
 
             $deprecations[] = [error_reporting(), $msg, $file];
+
+            return null;
         });
 
         register_shutdown_function(function () use ($outputFile, &$deprecations) {
@@ -125,7 +127,7 @@ public function handleError($type, $msg, $file, $line, $context = [])
 
         $deprecation = new Deprecation($msg, debug_backtrace(), $file);
         if ($deprecation->isMuted()) {
-            return;
+            return null;
         }
         $group = 'other';
 
@@ -164,6 +166,8 @@ public function handleError($type, $msg, $file, $line, $context = [])
         }
 
         ++$this->deprecations[$group.'Count'];
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -145,6 +145,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $io->newLine();
+
+        return null;
     }
 
     private function getFileLink(string $class): string
diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/StopwatchHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/StopwatchHelper.php
@@ -39,12 +39,14 @@ public function getName()
 
     public function __call($method, $arguments = [])
     {
-        if (null !== $this->stopwatch) {
-            if (method_exists($this->stopwatch, $method)) {
-                return $this->stopwatch->{$method}(...$arguments);
-            }
+        if (null === $this->stopwatch) {
+            return null;
+        }
 
-            throw new \BadMethodCallException(sprintf('Method "%s" of Stopwatch does not exist', $method));
+        if (method_exists($this->stopwatch, $method)) {
+            return $this->stopwatch->{$method}(...$arguments);
         }
+
+        throw new \BadMethodCallException(sprintf('Method "%s" of Stopwatch does not exist', $method));
     }
 }
diff --git a/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php b/src/Symfony/Bundle/WebServerBundle/WebServerConfig.php
@@ -117,7 +117,7 @@ public function getDisplayAddress()
         return gethostbyname($localHostname).':'.$this->port;
     }
 
-    private function findFrontController($documentRoot, $env)
+    private function findFrontController(string $documentRoot, string $env): ?string
     {
         $fileNames = $this->getFrontControllerFileNames($env);
 
@@ -126,14 +126,16 @@ private function findFrontController($documentRoot, $env)
                 return $fileName;
             }
         }
+
+        return null;
     }
 
-    private function getFrontControllerFileNames($env)
+    private function getFrontControllerFileNames(string $env): array
     {
         return ['app_'.$env.'.php', 'app.php', 'index_'.$env.'.php', 'index.php'];
     }
 
-    private function findBestPort()
+    private function findBestPort(): int
     {
         $port = 8000;
         while (false !== $fp = @fsockopen($this->hostname, $port, $errno, $errstr, 1)) {
diff --git a/src/Symfony/Component/Cache/Traits/ArrayTrait.php b/src/Symfony/Component/Cache/Traits/ArrayTrait.php
@@ -131,7 +131,7 @@ private function freeze($value, $key)
                 $message = sprintf('Failed to save key "{key}" of type %s: %s', $type, $e->getMessage());
                 CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);
 
-                return;
+                return null;
             }
             // Keep value serialized if it contains any objects or any internal references
             if ('C' === $serialized[0] || 'O' === $serialized[0] || preg_match('/;[OCRr]:[1-9]/', $serialized)) {
diff --git a/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php b/src/Symfony/Component/Console/Output/ConsoleSectionOutput.php
@@ -95,7 +95,9 @@ public function addContent(string $input)
     protected function doWrite($message, $newline)
     {
         if (!$this->isDecorated()) {
-            return parent::doWrite($message, $newline);
+            parent::doWrite($message, $newline);
+
+            return;
         }
 
         $erasedContent = $this->popStreamContentUntilCurrentSection();
diff --git a/src/Symfony/Component/Debug/ErrorHandler.php b/src/Symfony/Component/Debug/ErrorHandler.php
@@ -576,7 +576,9 @@ public function handleException($exception, array $error = null)
         $this->exceptionHandler = null;
         try {
             if (null !== $exceptionHandler) {
-                return $exceptionHandler($exception);
+                $exceptionHandler($exception);
+
+                return;
             }
             $handlerException = $handlerException ?: $exception;
         } catch (\Throwable $handlerException) {
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -276,6 +276,8 @@ private function make(string $id, int $invalidBehavior)
 
             throw new ServiceNotFoundException($id, null, null, $alternatives);
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -592,7 +592,7 @@ private function doGet($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_
             $definition = $this->getDefinition($id);
         } catch (ServiceNotFoundException $e) {
             if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE < $invalidBehavior) {
-                return;
+                return null;
             }
 
             throw $e;
diff --git a/src/Symfony/Component/DependencyInjection/Extension/Extension.php b/src/Symfony/Component/DependencyInjection/Extension/Extension.php
@@ -101,7 +101,7 @@ public function getConfiguration(array $config, ContainerBuilder $container)
         return null;
     }
 
-    final protected function processConfiguration(ConfigurationInterface $configuration, array $configs)
+    final protected function processConfiguration(ConfigurationInterface $configuration, array $configs): array
     {
         $processor = new Processor();
 
diff --git a/src/Symfony/Component/DomCrawler/Crawler.php b/src/Symfony/Component/DomCrawler/Crawler.php
@@ -1063,9 +1063,7 @@ private function relativize(string $xpath): string
      */
     public function getNode($position)
     {
-        if (isset($this->nodes[$position])) {
-            return $this->nodes[$position];
-        }
+        return isset($this->nodes[$position]) ? $this->nodes[$position] : null;
     }
 
     /**
@@ -1180,11 +1178,7 @@ private function discoverNamespace(\DOMXPath $domxpath, string $prefix): ?string
         // ask for one namespace, otherwise we'd get a collection with an item for each node
         $namespaces = $domxpath->query(sprintf('(//namespace::*[name()="%s"])[last()]', $this->defaultNamespacePrefix === $prefix ? '' : $prefix));
 
-        if ($node = $namespaces->item(0)) {
-            return $node->nodeValue;
-        }
-
-        return null;
+        return ($node = $namespaces->item(0)) ? $node->nodeValue : null;
     }
 
     private function findNamespacePrefixes(string $xpath): array
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntlTimeZoneToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/IntlTimeZoneToStringTransformer.php
@@ -34,7 +34,7 @@ public function __construct(bool $multiple = false)
     public function transform($intlTimeZone)
     {
         if (null === $intlTimeZone) {
-            return;
+            return null;
         }
 
         if ($this->multiple) {
diff --git a/src/Symfony/Component/HttpClient/Response/CurlResponse.php b/src/Symfony/Component/HttpClient/Response/CurlResponse.php
@@ -100,6 +100,8 @@ public function __construct(CurlClientState $multi, $ch, array $options = null,
 
                     return 1; // Abort the request
                 }
+
+                return null;
             });
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -88,7 +88,7 @@ class Response
     const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;                             // RFC6585
 
     /**
-     * @var \Symfony\Component\HttpFoundation\ResponseHeaderBag
+     * @var ResponseHeaderBag
      */
     public $headers;
 
diff --git a/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php b/src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
@@ -60,7 +60,7 @@ public function warmUp($cacheDir)
                 if (isset($collectedLogs[$message])) {
                     ++$collectedLogs[$message]['count'];
 
-                    return;
+                    return null;
                 }
 
                 $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3);
@@ -80,6 +80,8 @@ public function warmUp($cacheDir)
                     'trace' => $backtrace,
                     'count' => 1,
                 ];
+
+                return null;
             });
         }
 
diff --git a/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php b/src/Symfony/Component/HttpKernel/ControllerMetadata/ArgumentMetadataFactory.php
@@ -48,7 +48,7 @@ public function createArgumentMetadata($controller)
     private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbstract $function)
     {
         if (!$type = $parameter->getType()) {
-            return;
+            return null;
         }
         $name = $type->getName();
         $lcName = strtolower($name);
@@ -57,13 +57,15 @@ private function getType(\ReflectionParameter $parameter, \ReflectionFunctionAbs
             return $name;
         }
         if (!$function instanceof \ReflectionMethod) {
-            return;
+            return null;
         }
         if ('self' === $lcName) {
             return $function->getDeclaringClass()->name;
         }
         if ($parent = $function->getDeclaringClass()->getParentClass()) {
             return $parent->name;
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php b/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php
@@ -101,5 +101,7 @@ private function getFileLinkFormat()
                 ];
             }
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php b/src/Symfony/Component/Intl/Data/Generator/TimezoneDataGenerator.php
@@ -84,13 +84,13 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
         // Don't generate aliases, as they are resolved during runtime
         // Unless an alias is needed as fallback for de-duplication purposes
         if (isset($this->localeAliases[$displayLocale]) && !$this->generatingFallback) {
-            return;
+            return null;
         }
 
         $localeBundle = $reader->read($tempDir, $displayLocale);
 
         if (!isset($localeBundle['zoneStrings']) || null === $localeBundle['zoneStrings']) {
-            return;
+            return null;
         }
 
         $data = [
@@ -115,7 +115,7 @@ protected function generateDataForLocale(BundleEntryReaderInterface $reader, $te
             $data['Meta'] = array_diff($data['Meta'], $fallback['Meta']);
         }
         if (!$data['Names'] && !$data['Meta']) {
-            return;
+            return null;
         }
 
         $this->zoneIds = array_merge($this->zoneIds, array_keys($data['Names']));
diff --git a/src/Symfony/Component/Intl/Locale.php b/src/Symfony/Component/Intl/Locale.php
@@ -104,11 +104,7 @@ public static function getFallback($locale): ?string
 
         // Don't return default fallback for "root", "meta" or others
         // Normal locales have two or three letters
-        if (\strlen($locale) < 4) {
-            return self::$defaultFallback;
-        }
-
-        return null;
+        return \strlen($locale) < 4 ? self::$defaultFallback : null;
     }
 
     /**
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -1304,25 +1304,21 @@ private function getDescriptors(): array
     protected function buildCallback(callable $callback = null)
     {
         if ($this->outputDisabled) {
-            return function ($type, $data) use ($callback) {
-                if (null !== $callback) {
-                    return $callback($type, $data);
-                }
+            return function ($type, $data) use ($callback): bool {
+                return null !== $callback && $callback($type, $data);
             };
         }
 
         $out = self::OUT;
 
-        return function ($type, $data) use ($callback, $out) {
+        return function ($type, $data) use ($callback, $out): bool {
             if ($out == $type) {
                 $this->addOutput($data);
             } else {
                 $this->addErrorOutput($data);
             }
 
-            if (null !== $callback) {
-                return $callback($type, $data);
-            }
+            return null !== $callback && $callback($type, $data);
         };
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/ReflectionExtractor.php
@@ -151,6 +151,8 @@ public function getTypes($class, $property, array $context = [])
         if ($fromDefaultValue = $this->extractFromDefaultValue($class, $property)) {
             return $fromDefaultValue;
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Component/Yaml/Inline.php b/src/Symfony/Component/Yaml/Inline.php
@@ -566,7 +566,7 @@ private static function evaluateScalar(string $scalar, int $flags, array $refere
             case 'null' === $scalarLower:
             case '' === $scalar:
             case '~' === $scalar:
-                return;
+                return null;
             case 'true' === $scalarLower:
                 return true;
             case 'false' === $scalarLower:
@@ -586,7 +586,7 @@ private static function evaluateScalar(string $scalar, int $flags, array $refere
                             throw new ParseException('Object support when parsing a YAML file has been disabled.', self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                         }
 
-                        return;
+                        return null;
                     case 0 === strpos($scalar, '!php/const'):
                         if (self::$constantSupport) {
                             $i = 0;
@@ -600,7 +600,7 @@ private static function evaluateScalar(string $scalar, int $flags, array $refere
                             throw new ParseException(sprintf('The string "%s" could not be parsed as a constant. Have you forgotten to pass the "Yaml::PARSE_CONSTANT" flag to the parser?', $scalar), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
                         }
 
-                        return;
+                        return null;
                     case 0 === strpos($scalar, '!!float '):
                         return (float) substr($scalar, 8);
                     case 0 === strpos($scalar, '!!binary '):
diff --git a/src/Symfony/Component/Yaml/Parser.php b/src/Symfony/Component/Yaml/Parser.php
@@ -739,8 +739,6 @@ private function parseValue(string $value, int $flags, string $context)
      * @param string $style       The style indicator that was used to begin this block scalar (| or >)
      * @param string $chomping    The chomping indicator that was used to begin this block scalar (+ or -)
      * @param int    $indentation The indentation indicator that was used to begin this block scalar
-     *
-     * @return string The text value
      */
     private function parseBlockScalar(string $style, string $chomping = '', int $indentation = 0): string
     {
diff --git a/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php b/src/Symfony/Contracts/Service/ServiceSubscriberTrait.php
@@ -57,5 +57,7 @@ public function setContainer(ContainerInterface $container)
         if (\is_callable(['parent', __FUNCTION__])) {
             return parent::setContainer($container);
         }
+
+        return null;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,8 @@ public function getTypes($class, $property, array $context = [])`
`168`	`168`	`return $builtinType ? [new Type($builtinType, $nullable)] : null;`
`169`	`169`	`}`
`170`	`170`	`}`
	`171`	`+`
	`172`	`+ return null;`
`171`	`173`	`}`
`172`	`174`
`173`	`175`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,8 @@ public static function collectDeprecations($outputFile)`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`$deprecations[] = [error_reporting(), $msg, $file];`
	`110`	`+`
	`111`	`+ return null;`
`110`	`112`	`});`
`111`	`113`
`112`	`114`	`register_shutdown_function(function () use ($outputFile, &$deprecations) {`
`@@ -125,7 +127,7 @@ public function handleError($type, $msg, $file, $line, $context = [])`
`125`	`127`
`126`	`128`	`$deprecation = new Deprecation($msg, debug_backtrace(), $file);`
`127`	`129`	`if ($deprecation->isMuted()) {`
`128`		`- return;`
	`130`	`+ return null;`
`129`	`131`	`}`
`130`	`132`	`$group = 'other';`
`131`	`133`
`@@ -164,6 +166,8 @@ public function handleError($type, $msg, $file, $line, $context = [])`
`164`	`166`	`}`
`165`	`167`
`166`	`168`	`++$this->deprecations[$group.'Count'];`
	`169`	`+`
	`170`	`+ return null;`
`167`	`171`	`}`
`168`	`172`
`169`	`173`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,8 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`$io->newLine();`
	`148`	`+`
	`149`	`+ return null;`
`148`	`150`	`}`
`149`	`151`
`150`	`152`	`private function getFileLink(string $class): string`
Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,14 @@ public function getName()`
`39`	`39`
`40`	`40`	`public function __call($method, $arguments = [])`
`41`	`41`	`{`
`42`		`- if (null !== $this->stopwatch) {`
`43`		`- if (method_exists($this->stopwatch, $method)) {`
`44`		`- return $this->stopwatch->{$method}(...$arguments);`
`45`		`- }`
	`42`	`+ if (null === $this->stopwatch) {`
	`43`	`+ return null;`
	`44`	`+ }`
`46`	`45`
`47`		`- throw new \BadMethodCallException(sprintf('Method "%s" of Stopwatch does not exist', $method));`
	`46`	`+ if (method_exists($this->stopwatch, $method)) {`
	`47`	`+ return $this->stopwatch->{$method}(...$arguments);`
`48`	`48`	`}`
	`49`	`+`
	`50`	`+ throw new \BadMethodCallException(sprintf('Method "%s" of Stopwatch does not exist', $method));`
`49`	`51`	`}`
`50`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public function getDisplayAddress()`
`117`	`117`	`return gethostbyname($localHostname).':'.$this->port;`
`118`	`118`	`}`
`119`	`119`
`120`		`- private function findFrontController($documentRoot, $env)`
	`120`	`+ private function findFrontController(string $documentRoot, string $env): ?string`
`121`	`121`	`{`
`122`	`122`	`$fileNames = $this->getFrontControllerFileNames($env);`
`123`	`123`
`@@ -126,14 +126,16 @@ private function findFrontController($documentRoot, $env)`
`126`	`126`	`return $fileName;`
`127`	`127`	`}`
`128`	`128`	`}`
	`129`	`+`
	`130`	`+ return null;`
`129`	`131`	`}`
`130`	`132`
`131`		`- private function getFrontControllerFileNames($env)`
	`133`	`+ private function getFrontControllerFileNames(string $env): array`
`132`	`134`	`{`
`133`	`135`	`return ['app_'.$env.'.php', 'app.php', 'index_'.$env.'.php', 'index.php'];`
`134`	`136`	`}`
`135`	`137`
`136`		`- private function findBestPort()`
	`138`	`+ private function findBestPort(): int`
`137`	`139`	`{`
`138`	`140`	`$port = 8000;`
`139`	`141`	`while (false !== $fp = @fsockopen($this->hostname, $port, $errno, $errstr, 1)) {`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private function freeze($value, $key)`
`131`	`131`	`$message = sprintf('Failed to save key "{key}" of type %s: %s', $type, $e->getMessage());`
`132`	`132`	`CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);`
`133`	`133`
`134`		`- return;`
	`134`	`+ return null;`
`135`	`135`	`}`
`136`	`136`	`// Keep value serialized if it contains any objects or any internal references`
`137`	`137`	`if ('C' === $serialized[0] \|\| 'O' === $serialized[0] \|\| preg_match('/;[OCRr]:[1-9]/', $serialized)) {`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,9 @@ public function addContent(string $input)`
`95`	`95`	`protected function doWrite($message, $newline)`
`96`	`96`	`{`
`97`	`97`	`if (!$this->isDecorated()) {`
`98`		`- return parent::doWrite($message, $newline);`
	`98`	`+ parent::doWrite($message, $newline);`
	`99`	`+`
	`100`	`+ return;`
`99`	`101`	`}`
`100`	`102`
`101`	`103`	`$erasedContent = $this->popStreamContentUntilCurrentSection();`
Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,8 @@ private function make(string $id, int $invalidBehavior)`
`276`	`276`
`277`	`277`	`throw new ServiceNotFoundException($id, null, null, $alternatives);`
`278`	`278`	`}`
	`279`	`+`
	`280`	`+ return null;`
`279`	`281`	`}`
`280`	`282`
`281`	`283`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -592,7 +592,7 @@ private function doGet($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_`
`592`	`592`	`$definition = $this->getDefinition($id);`
`593`	`593`	`} catch (ServiceNotFoundException $e) {`
`594`	`594`	`if (ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE < $invalidBehavior) {`
`595`		`- return;`
	`595`	`+ return null;`
`596`	`596`	`}`
`597`	`597`
`598`	`598`	`throw $e;`