Merge branch '3.4' into 4.3

* 3.4:
  Fix inconsistent return points.
  [Security/Core] UserInterface::getPassword() can return null
  [Router] Fix TraceableUrlMatcher behaviour with trailing slash

Author: nicolas-grekas

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/RouterMatchCommand.php

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

Command/TranslationUpdateCommand.php

@@ -235,7 +235,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';
@@ -300,6 +300,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $errorIo->success($resultMessage.'.');
+
+        return null;
     }
 
     private function filterCatalogue(MessageCatalogue $catalogue, string $domain): MessageCatalogue

Console/Descriptor/JsonDescriptor.php

@@ -143,7 +143,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

@@ -253,7 +253,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

@@ -387,7 +387,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

@@ -100,7 +100,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));

Templating/GlobalVariables.php

@@ -49,35 +49,28 @@ public function getToken()
     public function getUser()
     {
         if (!$token = $this->getToken()) {
-            return;
+            return null;
         }
 
         $user = $token->getUser();
-        if (!\is_object($user)) {
-            return;
-        }
 
-        return $user;
+        return \is_object($user) ? $user : null;
     }
 
     /**
      * @return Request|null The HTTP request object
      */
     public function getRequest()
     {
-        if ($this->container->has('request_stack')) {
-            return $this->container->get('request_stack')->getCurrentRequest();
-        }
+        return $this->container->has('request_stack') ? $this->container->get('request_stack')->getCurrentRequest() : null;
     }
 
     /**
      * @return Session|null The session
      */
     public function getSession()
     {
-        if ($request = $this->getRequest()) {
-            return $request->getSession();
-        }
+        return ($request = $this->getRequest()) ? $request->getSession() : null;
     }
 
     /**

Templating/Helper/CodeHelper.php

@@ -116,7 +116,7 @@ public function formatArgs(array $args)
      * @param string $file A file path
      * @param int    $line The selected line number
      *
-     * @return string An HTML string
+     * @return string|null An HTML string
      */
     public function fileExcerpt($file, $line)
     {
@@ -144,6 +144,8 @@ public function fileExcerpt($file, $line)
 
             return '<ol start="'.max($line - 3, 1).'">'.implode("\n", $lines).'</ol>';
         }
+
+        return null;
     }
 
     /**

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -97,7 +97,9 @@ public function testPropertyAccessCache()
         $container = $this->createContainerFromFile('property_accessor');
 
         if (!method_exists(PropertyAccessor::class, 'createCache')) {
-            return $this->assertFalse($container->hasDefinition('cache.property_access'));
+            $this->assertFalse($container->hasDefinition('cache.property_access'));
+
+            return;
         }
 
         $cache = $container->getDefinition('cache.property_access');
@@ -110,7 +112,9 @@ public function testPropertyAccessCacheWithDebug()
         $container = $this->createContainerFromFile('property_accessor', ['kernel.debug' => true]);
 
         if (!method_exists(PropertyAccessor::class, 'createCache')) {
-            return $this->assertFalse($container->hasDefinition('cache.property_access'));
+            $this->assertFalse($container->hasDefinition('cache.property_access'));
+
+            return;
         }
 
         $cache = $container->getDefinition('cache.property_access');