Nicer callstak and formatting fix

michael-grunder · michael-grunder · commit 1f84a9d29650 · 2025-05-07T12:10:38.000-07:00
diff --git a/tests/RedisClusterTest.php b/tests/RedisClusterTest.php
@@ -139,25 +139,22 @@ public function setUp() {
         $this->is_valkey = $this->detectValkey($info);
     }
 
-    protected static function dumpBacktrace() {
-        foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $i => $frame) {
-            $file = isset($frame['file']) ? basename($frame['file']) : '[internal]';
-            $line = $frame['line'] ?? '?';
-            TestSuite::errorMessage("  %s:%d", $file, $line);
-        }
-    }
-
     /* Override newInstance as we want a RedisCluster object */
     protected function newInstance() {
         try {
             return new RedisCluster(NULL, self::$seeds, 30, 30, true, $this->getAuth());
         } catch (Exception $ex) {
-            TestSuite::errorMessage("Fatal error: %s\n", $ex->getMessage());
-            TestSuite::errorMessage("Seeds: %s\n", implode(' ', self::$seeds));
-            TestSuite::errorMessage("Seed source: %s\n", self::$seed_source);
-
-            TestSuite::errorMessage("Backtrace:\n");
-            self::dumpBacktrace();
+            TestSuite::errorMessage("Fatal error: %s", $ex->getMessage());
+            TestSuite::errorMessage("Seeds: %s", implode(' ', self::$seeds));
+            TestSuite::errorMessage("Seed source: %s", self::$seed_source);
+            TestSuite::errorMessage("Backtrace:");
+
+            foreach (debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS) as $i => $frame) {
+                $file = isset($frame['file']) ? basename($frame['file']) : '[internal]';
+                $line = $frame['line'] ?? '?';
+                $func = $frame['function'] ?? 'unknown';
+                TestSuite::errorMessage("  %s:%d [%s]", $file, $line, $func);
+            }
 
             exit(1);
         }
