symfony · nicolas-grekas · Aug 7, 2019 · Aug 7, 2019
diff --git a/src/Symfony/Bridge/Monolog/Logger.php b/src/Symfony/Bridge/Monolog/Logger.php
@@ -73,5 +73,7 @@ private function getDebugLogger()
                 return $handler;
             }
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php b/src/Symfony/Bundle/SecurityBundle/Security/FirewallMap.php
@@ -135,14 +135,14 @@ public function getFirewallConfig(Request $request)
         $context = $this->getFirewallContext($request);
    
         if (null === $context) {
-            return;
+            return null;
         }
 
         return $context->getConfig();
     }
 
     /**
-     * @return FirewallContext
+     * @return FirewallContext|null
      */
     private function getFirewallContext(Request $request)
     {
@@ -164,5 +164,7 @@ private function getFirewallContext(Request $request)
                 return $this->container->get($contextId);
             }
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Component/Console/Terminal.php b/src/Symfony/Component/Console/Terminal.php
@@ -87,25 +87,13 @@ private static function initDimensions()
      */
     private static function getConsoleMode()
     {
-        if (!\function_exists('proc_open')) {
-            return;
-        }
+        $info = self::readFromProcess('mode CON');
 
-        $descriptorspec = [
-            1 => ['pipe', 'w'],
-            2 => ['pipe', 'w'],
-        ];
-        $process = proc_open('mode CON', $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
-        if (\is_resource($process)) {
-            $info = stream_get_contents($pipes[1]);
-            fclose($pipes[1]);
-            fclose($pipes[2]);
-            proc_close($process);
-
-            if (preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
-                return [(int) $matches[2], (int) $matches[1]];
-            }
+        if (null === $info || !preg_match('/--------+\r?\n.+?(\d+)\r?\n.+?(\d+)\r?\n/', $info, $matches)) {
+            return null;
         }
+
+        return [(int) $matches[2], (int) $matches[1]];
     }
 
     /**
@@ -114,24 +102,36 @@ private static function getConsoleMode()
      * @return string|null
      */
     private static function getSttyColumns()
+    {
+        return self::readFromProcess('stty -a | grep columns');
+    }
+
+    /**
+     * @param string $command
+     *
+     * @return string|null
+     */
+    private static function readFromProcess($command)
     {
         if (!\function_exists('proc_open')) {
-            return;
+            return null;
         }
 
         $descriptorspec = [
             1 => ['pipe', 'w'],
             2 => ['pipe', 'w'],
         ];
 
-        $process = proc_open('stty -a | grep columns', $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
-        if (\is_resource($process)) {
-            $info = stream_get_contents($pipes[1]);
-            fclose($pipes[1]);
-            fclose($pipes[2]);
-            proc_close($process);
-
-            return $info;
+        $process = proc_open($command, $descriptorspec, $pipes, null, null, ['suppress_errors' => true]);
+        if (!\is_resource($process)) {
+            return null;
         }
+
+        $info = stream_get_contents($pipes[1]);
+        fclose($pipes[1]);
+        fclose($pipes[2]);
+        proc_close($process);
+
+        return $info;
     }
 }
@@ -318,7 +318,7 @@ private function getAutowiredReference(TypedReference $reference, $deprecationMe
         }
 
         if (!$reference->canBeAutoregistered() || isset($this->types[$type]) || isset($this->ambiguousServiceTypes[$type])) {
-            return;
+            return null;
         }
 
         if (isset($this->autowired[$type])) {
@@ -328,6 +328,8 @@ private function getAutowiredReference(TypedReference $reference, $deprecationMe
         if (!$this->strictMode) {
             return $this->createAutowiredDefinition($type);
         }
+
+        return null;
     }
 
     /**
@@ -425,7 +427,7 @@ private function set($type, $id)
     private function createAutowiredDefinition($type)
     {
         if (!($typeHint = $this->container->getReflectionClass($type, false)) || !$typeHint->isInstantiable()) {
-            return;
+            return null;
         }
 
         $currentId = $this->currentId;
@@ -445,7 +447,7 @@ private function createAutowiredDefinition($type)
             $this->lastFailure = $e->getMessage();
             $this->container->log($this, $this->lastFailure);
 
-            return;
+            return null;
         } finally {
             $this->throwOnAutowiringException = $originalThrowSetting;
             $this->currentId = $currentId;
@@ -518,7 +520,7 @@ private function createTypeAlternatives(TypedReference $reference)
         } elseif ($reference->getRequiringClass() && !$reference->canBeAutoregistered() && !$this->strictMode) {
             return ' It cannot be auto-registered because it is from a different root namespace.';
         } else {
-            return;
+            return '';
         }
 
         return sprintf(' You should maybe alias this %s to %s.', class_exists($type, false) ? 'class' : 'interface', $message);
@@ -572,5 +574,7 @@ private function getAliasesSuggestionForType($type, $extraContext = null)
         if ($aliases) {
             return sprintf('Try changing the type-hint%s to "%s" instead.', $extraContext, $aliases[0]);
         }
+
+        return null;
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -211,7 +211,7 @@ private function parseDefinition(\DOMElement $service, $file, array $defaults)
                 $alias->setPublic($defaults['public']);
             }
 
-            return;
+            return null;
         }
 
         if ($this->isLoadingInstanceof) {

diff --git a/src/Symfony/Component/HttpKernel/HttpCache/Store.php b/src/Symfony/Component/HttpKernel/HttpCache/Store.php
@@ -134,7 +134,7 @@ public function lookup(Request $request)
         $key = $this->getCacheKey($request);
 
         if (!$entries = $this->getMetadata($key)) {
-            return;
+            return null;
         }
 
         // find a cached entry that matches the request.
@@ -148,7 +148,7 @@ public function lookup(Request $request)
         }
 
         if (null === $match) {
-            return;
+            return null;
         }
 
            $headers = $match[1];
@@ -159,6 +159,7 @@ public function lookup(Request $request)
         // TODO the metaStore referenced an entity that doesn't exist in
         // the entityStore. We definitely want to return nil but we should
         // also purge the entry from the meta-store when this is detected.
+        return null;
     }
 
     /**
@@ -180,7 +181,7 @@ public function write(Request $request, Response $response)
         if (!$response->headers->has('X-Content-Digest')) {
             $digest = $this->generateContentDigest($response);
 
-            if (false === $this->save($digest, $response->getContent())) {
+            if (!$this->save($digest, $response->getContent())) {
                 throw new \RuntimeException('Unable to store the entity.');
             }
 
@@ -209,7 +210,7 @@ public function write(Request $request, Response $response)
 
         array_unshift($entries, [$storedEnv, $headers]);
 
-        if (false === $this->save($key, serialize($entries))) {
+        if (!$this->save($key, serialize($entries))) {
             throw new \RuntimeException('Unable to store the metadata.');
         }
 
@@ -248,7 +249,7 @@ public function invalidate(Request $request)
             }
         }
 
-        if ($modified && false === $this->save($key, serialize($entries))) {
+        if ($modified && !$this->save($key, serialize($entries))) {
             throw new \RuntimeException('Unable to store the metadata.');
         }
     }
@@ -408,6 +409,8 @@ private function save($key, $data)
         }
 
         @chmod($path, 0666 & ~umask());
+
+        return true;
     }
 
     public function getPath($key)

diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -840,6 +840,8 @@ private function findAdderAndRemover(\ReflectionClass $reflClass, array $singula
                 return [$addMethod, $removeMethod];
             }
         }
+
+        return null;
     }
 
     /**

diff --git a/src/Symfony/Component/Routing/Loader/XmlFileLoader.php b/src/Symfony/Component/Routing/Loader/XmlFileLoader.php
@@ -261,7 +261,7 @@ private function parseConfigs(\DOMElement $node, $path)
     private function parseDefaultsConfig(\DOMElement $element, $path)
     {
         if ($this->isElementValueNull($element)) {
-            return;
+            return null;
         }
 
         // Check for existing element nodes in the default element. There can
@@ -298,7 +298,7 @@ private function parseDefaultsConfig(\DOMElement $element, $path)
     private function parseDefaultNode(\DOMElement $node, $path)
     {
         if ($this->isElementValueNull($node)) {
-            return;
+            return null;
         }
 
         switch ($node->localName) {

@@ -243,6 +243,8 @@ private function getNormalizer($data, $format, array $context)
                 return $normalizer;
             }
         }
+
+        return null;
     }
 
     /**
@@ -262,6 +264,8 @@ private function getDenormalizer($data, $class, $format, array $context)
                 return $normalizer;
             }
         }
+
+        return null;
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,5 +73,7 @@ private function getDebugLogger() @@
                     return $handler;
                 }
             }
+            return null;
         }
     }