Bridge: Nette\MemberAccessException may not throw only ObjectHelpers

dg · dg · commit 61298f99ed37 · 2024-12-17T05:15:55.000+01:00
diff --git a/src/Bridges/Nette/Bridge.php b/src/Bridges/Nette/Bridge.php
@@ -104,7 +104,10 @@ public static function renderMemberAccessException(?\Throwable $e): ?array
 			return null;
 		}
 
-		$loc = $e->getTrace()[$e instanceof Nette\MemberAccessException ? 1 : 0];
+		$trace = $e->getTrace();
+		do {
+			$loc = array_shift($trace);
+		} while (($loc['class'] ?? null) === Nette\Utils\ObjectHelpers::class);
 		if (!isset($loc['file'])) {
 			return null;
 		}

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,10 @@ public static function renderMemberAccessException(?\Throwable $e): ?array`
`104`	`104`	`return null;`
`105`	`105`	`}`
`106`	`106`
`107`		`- $loc = $e->getTrace()[$e instanceof Nette\MemberAccessException ? 1 : 0];`
	`107`	`+ $trace = $e->getTrace();`
	`108`	`+ do {`
	`109`	`+ $loc = array_shift($trace);`
	`110`	`+ } while (($loc['class'] ?? null) === Nette\Utils\ObjectHelpers::class);`
`108`	`111`	`if (!isset($loc['file'])) {`
`109`	`112`	`return null;`
`110`	`113`	`}`