Fix invalid references in exception stack trace

clue · clue · commit d8cd8bac18d5 · 2022-06-22T10:14:15.000+02:00
diff --git a/src/ProxyConnector.php b/src/ProxyConnector.php
@@ -256,11 +256,11 @@ public function connect($uri)
 
             // Exception trace arguments are not available on some PHP 7.4 installs
             // @codeCoverageIgnoreStart
-            foreach ($trace as &$one) {
+            foreach ($trace as $ti => $one) {
                 if (isset($one['args'])) {
-                    foreach ($one['args'] as &$arg) {
+                    foreach ($one['args'] as $ai => $arg) {
                         if ($arg instanceof \Closure) {
-                            $arg = 'Object(' . get_class($arg) . ')';
+                            $trace[$ti]['args'][$ai] = 'Object(' . get_class($arg) . ')';
                         }
                     }
                 }
diff --git a/tests/ProxyConnectorTest.php b/tests/ProxyConnectorTest.php
@@ -302,15 +302,17 @@ public function testRejectsWithPreviousIfConnectorRejects()
 
         $promise = $proxy->connect('google.com:80');
 
-        $promise->then(null, $this->expectCallableOnceWithException(
-            'RuntimeException',
-            'Connection to tcp://google.com:80 failed because connection to proxy failed (ECONNREFUSED)',
-            defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111
-        ));
+        $exception = null;
+        $promise->then(null, function ($reason) use (&$exception) {
+            $exception = $reason;
+        });
 
-        $promise->then(null, $this->expectCallableOnceWith($this->callback(function (\Exception $e) use ($previous) {
-            return $e->getPrevious() === $previous;
-        })));
+        assert($exception instanceof \RuntimeException);
+        $this->assertInstanceOf('RuntimeException', $exception);
+        $this->assertEquals('Connection to tcp://google.com:80 failed because connection to proxy failed (ECONNREFUSED)', $exception->getMessage());
+        $this->assertEquals(defined('SOCKET_ECONNREFUSED') ? SOCKET_ECONNREFUSED : 111, $exception->getCode());
+        $this->assertSame($previous, $exception->getPrevious());
+        $this->assertNotEquals('', $exception->getTraceAsString());
     }
 
     public function testRejectsAndClosesIfStreamWritesNonHttp()

Original file line number	Diff line number	Diff line change
`@@ -256,11 +256,11 @@ public function connect($uri)`
`256`	`256`
`257`	`257`	`// Exception trace arguments are not available on some PHP 7.4 installs`
`258`	`258`	`// @codeCoverageIgnoreStart`
`259`		`- foreach ($trace as &$one) {`
	`259`	`+ foreach ($trace as $ti => $one) {`
`260`	`260`	`if (isset($one['args'])) {`
`261`		`- foreach ($one['args'] as &$arg) {`
	`261`	`+ foreach ($one['args'] as $ai => $arg) {`
`262`	`262`	`if ($arg instanceof \Closure) {`
`263`		`- $arg = 'Object(' . get_class($arg) . ')';`
	`263`	`+ $trace[$ti]['args'][$ai] = 'Object(' . get_class($arg) . ')';`
`264`	`264`	`}`
`265`	`265`	`}`
`266`	`266`	`}`