Merge branch '4.2' into 4.3
* 4.2: fixed CS [Debug][DebugClassLoader] Include found files instead of requiring them
This commit is contained in:
commit
dcd0a64394
@ -153,11 +153,11 @@ class DebugClassLoader
|
|||||||
if (!$file = $this->classLoader[0]->findFile($class) ?: false) {
|
if (!$file = $this->classLoader[0]->findFile($class) ?: false) {
|
||||||
// no-op
|
// no-op
|
||||||
} elseif (\function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file)) {
|
} elseif (\function_exists('opcache_is_script_cached') && @opcache_is_script_cached($file)) {
|
||||||
require $file;
|
include $file;
|
||||||
|
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
require $file;
|
include $file;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
($this->classLoader)($class);
|
($this->classLoader)($class);
|
||||||
|
Reference in New Issue
Block a user