Unit-Test fix

bkdotcom · Aug 8, 2023 · 13ed0ff · 13ed0ff
1 parent 1e7db60
commit 13ed0ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/Backtrace/Backtrace.php b/src/Backtrace/Backtrace.php
@@ -94,7 +94,7 @@ public static function getCallerInfo($offset = 0, $options = 0)
             we need to collect object... we'll remove object at end if undesired
         */
         $phpOptions = static::translateOptions($options | self::INCL_OBJECT);
-        $backtrace = \debug_backtrace($phpOptions, 22);
+        $backtrace = \debug_backtrace($phpOptions, 28);
         $index = SkipInternal::getFirstIndex($backtrace, $offset);
         $return = static::callerInfoBuild(\array_slice($backtrace, $index));
         if (!($options & self::INCL_OBJECT)) {

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -34,7 +34,9 @@ function headers_list()
         $headersByName[$name][] = $header;
     }
     $values = \array_values($headersByName);
-    return \call_user_func_array('array_merge', $values);
+    return $values
+        ? \call_user_func_array('array_merge', $values)
+        : array();
 }
 
 function headers_sent(&$file = null, &$line = null)