Skip to content

Commit 9822766

Browse files
Merge branch '3.4' into 4.3
* 3.4: Fix failures on PHP 7.4
2 parents 3810fff + a599a86 commit 9822766

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Resource/ClassExistenceResource.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public function isFresh($timestamp)
7272
spl_autoload_register(__CLASS__.'::throwOnRequiredClass');
7373
}
7474
$autoloadedClass = self::$autoloadedClass;
75-
self::$autoloadedClass = $this->resource;
75+
self::$autoloadedClass = ltrim($this->resource, '\\');
7676

7777
try {
7878
$exists = class_exists($this->resource) || interface_exists($this->resource, false) || trait_exists($this->resource, false);
@@ -153,7 +153,7 @@ public static function throwOnRequiredClass($class, \Exception $previous = null)
153153
throw $e;
154154
}
155155

156-
$trace = $e->getTrace();
156+
$trace = debug_backtrace();
157157
$autoloadFrame = [
158158
'function' => 'spl_autoload_call',
159159
'args' => [$class],

0 commit comments

Comments
 (0)