From 0abd2712e9841c78871af8fbb9eed8c1b69eac6f Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 26 Aug 2019 17:52:30 +0200
Subject: [PATCH] [ErrorHandler] make DebugClassLoader turn multi-types
 declarations to "object"

---
 .../ErrorHandler/DebugClassLoader.php          | 18 ++++++++++++++++--
 .../Handler/RedisArraySessionHandlerTest.php   |  5 ++++-
 .../Handler/RedisClusterSessionHandlerTest.php |  5 ++++-
 .../Handler/RedisSessionHandlerTest.php        |  5 ++++-
 4 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
index 4acf53101e..1f30cfa9f5 100644
--- a/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
+++ b/src/Symfony/Component/ErrorHandler/DebugClassLoader.php
@@ -752,6 +752,14 @@ class DebugClassLoader
             unset($typesMap['array']);
         }
 
+        $iterable = $object = true;
+        foreach ($typesMap as $n => $t) {
+            if ('null' !== $n) {
+                $iterable = $iterable && (\in_array($n, ['array', 'iterable']) || false !== strpos($n, 'Iterator'));
+                $object = $object && (\in_array($n, ['callable', 'object', '$this', 'static']) || !isset(self::SPECIAL_RETURN_TYPES[$n]));
+            }
+        }
+
         $normalizedType = key($typesMap);
         $returnType = current($typesMap);
 
@@ -762,8 +770,14 @@ class DebugClassLoader
                 $normalizedType = $t;
                 $returnType = $t;
             } elseif ($n !== $normalizedType || !preg_match('/^\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+(?:\\\\[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*+)*+$/', $n)) {
-                // ignore multi-types return declarations
-                return;
+                if ($iterable) {
+                    $normalizedType = $returnType = 'iterable';
+                } elseif ($object) {
+                    $normalizedType = $returnType = 'object';
+                } else {
+                    // ignore multi-types return declarations
+                    return;
+                }
             }
         }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php
index b03a37236f..3ef6cb694b 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisArraySessionHandlerTest.php
@@ -13,7 +13,10 @@ namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
 class RedisArraySessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
-    protected function createRedisClient(string $host): \RedisArray
+    /**
+     * @return \RedisArray|object
+     */
+    protected function createRedisClient(string $host)
     {
         return new \RedisArray([$host]);
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php
index c1ba70dcb0..8b4cd1cdd6 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisClusterSessionHandlerTest.php
@@ -24,7 +24,10 @@ class RedisClusterSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
         }
     }
 
-    protected function createRedisClient(string $host): \RedisCluster
+    /**
+     * @return \RedisCluster|object
+     */
+    protected function createRedisClient(string $host)
     {
         return new \RedisCluster(null, explode(' ', getenv('REDIS_CLUSTER_HOSTS')));
     }
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
index afdb6c503b..71658f0723 100644
--- a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
+++ b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/RedisSessionHandlerTest.php
@@ -13,7 +13,10 @@ namespace Symfony\Component\HttpFoundation\Tests\Session\Storage\Handler;
 
 class RedisSessionHandlerTest extends AbstractRedisSessionHandlerTestCase
 {
-    protected function createRedisClient(string $host): \Redis
+    /**
+     * @return \Redis|object
+     */
+    protected function createRedisClient(string $host)
     {
         $client = new \Redis();
         $client->connect($host);