|
|
@@ -59,13 +59,16 @@ class App
|
|
|
}
|
|
|
|
|
|
[$plugin, $name] = pluginSplit($class);
|
|
|
- $base = $plugin ?: Configure::read('App.namespace');
|
|
|
- $base = str_replace('/', '\\', rtrim($base, '\\'));
|
|
|
$fullname = '\\' . str_replace('/', '\\', $type . '\\' . $name) . $suffix;
|
|
|
|
|
|
- if (static::_classExistsInBase($fullname, $base)) {
|
|
|
- /** @var class-string */
|
|
|
- return $base . $fullname;
|
|
|
+ $base = $plugin ?: Configure::read('App.namespace');
|
|
|
+ if ($base !== null) {
|
|
|
+ $base = str_replace('/', '\\', rtrim($base, '\\'));
|
|
|
+
|
|
|
+ if (static::_classExistsInBase($fullname, $base)) {
|
|
|
+ /** @var class-string */
|
|
|
+ return $base . $fullname;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
if ($plugin || !static::_classExistsInBase($fullname, 'Cake')) {
|