Merge branch '3.4' into 4.3

* 3.4:
  Fix return statements
  [TwigBridge] add missing dep
  Add false type to ChoiceListFactoryInterface::createView $label argument

Author: nicolas-grekas

Controller/ControllerTrait.php

@@ -351,7 +351,7 @@ protected function getDoctrine(): ManagerRegistry
     /**
      * Get a user from the Security Token Storage.
      *
-     * @return mixed
+     * @return object|null
      *
      * @throws \LogicException If SecurityBundle is not available
      *
@@ -366,12 +366,12 @@ protected function getUser()
         }
 
         if (null === $token = $this->container->get('security.token_storage')->getToken()) {
-            return;
+            return null;
         }
 
         if (!\is_object($user = $token->getUser())) {
             // e.g. anonymous authentication
-            return;
+            return null;
         }
 
         return $user;

Templating/GlobalVariables.php

@@ -40,7 +40,7 @@ public function __construct(ContainerInterface $container)
     public function getToken()
     {
         if (!$this->container->has('security.token_storage')) {
-            return;
+            return null;
         }
 
         return $this->container->get('security.token_storage')->getToken();

Templating/Helper/CodeHelper.php

@@ -126,7 +126,7 @@ public function fileExcerpt($file, $line)
 
                 // Check if the file is an application/octet-stream (eg. Phar file) because highlight_file cannot parse these files
                 if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {
-                    return;
+                    return '';
                 }
             }