ensure compatibility with PHP 8 stack traces

xabbuh · xabbuh · commit 2ca4545880b7 · 2020-07-08T17:31:45.000+02:00
diff --git a/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php b/src/Symfony/Component/Cache/Adapter/PhpArrayAdapter.php
@@ -275,9 +275,40 @@ public static function throwOnRequiredClass($class)
             'function' => 'spl_autoload_call',
             'args' => [$class],
         ];
-        $i = 1 + array_search($autoloadFrame, $trace, true);
 
-        if (isset($trace[$i]['function']) && !isset($trace[$i]['class'])) {
+        if (false === $i = array_search($autoloadFrame, $trace, true)) {
+            if (\PHP_VERSION_ID >= 80000) {
+                foreach ($trace as $frame) {
+                    if ([$class] !== $frame['args']) {
+                        continue;
+                    }
+
+                    if (isset($frame['function']) && !isset($frame['class'])) {
+                        switch ($frame['function']) {
+                            case 'get_class_methods':
+                            case 'get_class_vars':
+                            case 'get_parent_class':
+                            case 'is_a':
+                            case 'is_subclass_of':
+                            case 'class_exists':
+                            case 'class_implements':
+                            case 'class_parents':
+                            case 'trait_exists':
+                            case 'defined':
+                            case 'interface_exists':
+                            case 'method_exists':
+                            case 'property_exists':
+                            case 'is_callable':
+                                return;
+                        }
+                    }
+                }
+            }
+
+            throw $e;
+        }
+
+        if (isset($trace[++$i]['function']) && !isset($trace[$i]['class'])) {
             switch ($trace[$i]['function']) {
                 case 'get_class_methods':
                 case 'get_class_vars':
diff --git a/src/Symfony/Component/Config/Resource/ClassExistenceResource.php b/src/Symfony/Component/Config/Resource/ClassExistenceResource.php
@@ -191,6 +191,34 @@ public static function throwOnRequiredClass($class, \Exception $previous = null)
         ];
 
         if (false === $i = array_search($autoloadFrame, $trace, true)) {
+            if (\PHP_VERSION_ID >= 80000) {
+                foreach ($trace as $frame) {
+                    if ([$class] !== $frame['args']) {
+                        continue;
+                    }
+
+                    if (isset($frame['function']) && !isset($frame['class'])) {
+                        switch ($frame['function']) {
+                            case 'get_class_methods':
+                            case 'get_class_vars':
+                            case 'get_parent_class':
+                            case 'is_a':
+                            case 'is_subclass_of':
+                            case 'class_exists':
+                            case 'class_implements':
+                            case 'class_parents':
+                            case 'trait_exists':
+                            case 'defined':
+                            case 'interface_exists':
+                            case 'method_exists':
+                            case 'property_exists':
+                            case 'is_callable':
+                                return;
+                        }
+                    }
+                }
+            }
+
             throw $e;
         }
 
