Fix inconsistent return points.

Author: derrabus

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;
     }
 }

Command/DebugAutowiringCommand.php

@@ -93,5 +93,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $io->table([], $tableRows);
+
+        return null;
     }
 }

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;
     }
 }

Command/RouterMatchCommand.php

@@ -149,5 +149,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             return 1;
         }
+
+        return null;
     }
 }

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)

Console/Descriptor/JsonDescriptor.php

@@ -142,7 +142,9 @@ protected function describeContainerDefinition(Definition $definition, array $op
     protected function describeContainerAlias(Alias $alias, array $options = [], ContainerBuilder $builder = null)
     {
         if (!$builder) {
-            return $this->writeData($this->getContainerAliasData($alias), $options);
+            $this->writeData($this->getContainerAliasData($alias), $options);
+
+            return;
         }
 
         $this->writeData(

Console/Descriptor/MarkdownDescriptor.php

@@ -249,7 +249,9 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
             ."\n".'- Public: '.($alias->isPublic() && !$alias->isPrivate() ? 'yes' : 'no');
 
         if (!isset($options['id'])) {
-            return $this->write($output);
+            $this->write($output);
+
+            return;
         }
 
         $this->write(sprintf("### %s\n\n%s\n", $options['id'], $output));

Console/Descriptor/TextDescriptor.php

@@ -369,7 +369,7 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
             return;
         }
 
-        return $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]));
+        $this->describeContainerDefinition($builder->getDefinition((string) $alias), array_merge($options, ['id' => (string) $alias]));
     }
 
     /**

Console/Descriptor/XmlDescriptor.php

@@ -98,7 +98,9 @@ protected function describeContainerAlias(Alias $alias, array $options = [], Con
         $dom->appendChild($dom->importNode($this->getContainerAliasDocument($alias, isset($options['id']) ? $options['id'] : null)->childNodes->item(0), true));
 
         if (!$builder) {
-            return $this->writeDocument($dom);
+            $this->writeDocument($dom);
+
+            return;
         }
 
         $dom->appendChild($dom->importNode($this->getContainerDefinitionDocument($builder->getDefinition((string) $alias), (string) $alias)->childNodes->item(0), true));

EventListener/SessionListener.php

@@ -34,10 +34,6 @@ public function __construct(ContainerInterface $container)
 
     protected function getSession()
     {
-        if (!$this->container->has('session')) {
-            return;
-        }
-
-        return $this->container->get('session');
+        return $this->container->get('session', ContainerInterface::NULL_ON_INVALID_REFERENCE);
     }
 }