@@ -42,18 +42,19 @@ class ExceptionCaster
4242
4343 public static function castException (\Exception $ earray $ aStub $ stub$ isNested
4444 {
45- $ trace$ a"\0Exception \0trace " ];
46- unset($ a"\0Exception \0trace " ]); // Ensures the trace is always last
45+ $ xPrefixPHP_VERSION_ID >= 70000 ? "\0BaseException \0" : "\0Exception \0" ;
46+ $ trace$ a$ xPrefix'trace ' ];
47+ unset($ a$ xPrefix'trace ' ]); // Ensures the trace is always last
4748
4849 static ::filterTrace ($ tracestatic ::$ traceArgs
4950
5051 if (null !== $ trace
51- $ a"\0 Exception \0 trace " $ trace
52+ $ a$ xPrefix . ' trace ' $ trace
5253 }
53- if (empty ($ a"\0 Exception \0 previous "
54- unset($ a"\0 Exception \0 previous "
54+ if (empty ($ a$ xPrefix . ' previous '
55+ unset($ a$ xPrefix . ' previous '
5556 }
56- unset($ a"\0 Exception \0 string " $ a"\0+ \0xdebug_message " ], $ a"\0+ \0__destructorException " ]);
57+ unset($ a$ xPrefix . ' string ' $ a"\0+ \0xdebug_message " ], $ a"\0+ \0__destructorException " ]);
5758
5859 return $ a
5960 }
@@ -69,23 +70,20 @@ public static function castErrorException(\ErrorException $e, array $a, Stub $st
6970
7071 public static function castThrowingCasterException (ThrowingCasterException $ earray $ aStub $ stub$ isNested
7172 {
72- $ barray ) $ a"\0Exception \0previous " ];
73+ $ xPrefixPHP_VERSION_ID >= 70000 ? "\0BaseException \0" : "\0Exception \0" ;
74+ $ barray ) $ a$ xPrefix'previous ' ];
7375
74- if (isset ($ b"\0* \0message " ])) {
75- $ a"\0~ \0message " ] = $ b"\0* \0message " ];
76- }
77-
78- if (isset ($ a"\0Exception \0trace " ])) {
79- $ b"\0Exception \0trace " ][0 ] += array (
76+ if (isset ($ a$ xPrefix'trace ' ][0 ])) {
77+ $ b$ xPrefix'trace ' ][0 ] += array (
8078 'file ' => $ b"\0* \0file " ],
8179 'line ' => $ b"\0* \0line " ],
8280 );
83- array_splice ($ b"\0 Exception \0 trace " 1 - count ($ a"\0 Exception \0 trace "
84- static ::filterTrace ($ b"\0 Exception \0 trace " false );
85- $ a"\0~ \0trace " ] = $ b"\0 Exception \0 trace "
81+ array_splice ($ b$ xPrefix . ' trace ' 1 - count ($ a$ xPrefix . ' trace '
82+ static ::filterTrace ($ b$ xPrefix . ' trace ' false );
83+ $ a"\0~ \0trace " ] = $ b$ xPrefix . ' trace '
8684 }
8785
88- unset($ a"\0 Exception \0 trace " $ a"\0 Exception \0 previous " $ a"\0* \0code " ], $ a"\0* \0file " ], $ a"\0* \0line " ]);
86+ unset($ a$ xPrefix . ' trace ' $ a$ xPrefix . ' previous ' $ a"\0* \0code " ], $ a"\0* \0file " ], $ a"\0* \0line " ]);
8987
9088 return $ a
9189 }
0 commit comments