diff --git a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
index 38111078bc311..96a58be800e4b 100644
--- a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
+++ b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
@@ -29,50 +29,34 @@ public function enhance(\Throwable $error): ?\Throwable
{
// Some specific versions of PHP produce a fatal error when extending a not found class.
$message = !$error instanceof FatalError ? $error->getMessage() : $error->getError()['message'];
- $messageLen = \strlen($message);
- $notFoundSuffix = '\' not found';
- $notFoundSuffixLen = \strlen($notFoundSuffix);
- if ($notFoundSuffixLen > $messageLen) {
+ if (!preg_match('/^(Class|Interface|Trait) [\'"]([^\'"]+)[\'"] not found$/', $message, $matches)) {
return null;
}
-
- if (0 !== substr_compare($message, $notFoundSuffix, -$notFoundSuffixLen)) {
- return null;
+ $typeName = strtolower($matches[1]);
+ $fullyQualifiedClassName = $matches[2];
+
+ if (false !== $namespaceSeparatorIndex = strrpos($fullyQualifiedClassName, '\\')) {
+ $className = substr($fullyQualifiedClassName, $namespaceSeparatorIndex + 1);
+ $namespacePrefix = substr($fullyQualifiedClassName, 0, $namespaceSeparatorIndex);
+ $message = sprintf('Attempted to load %s "%s" from namespace "%s".', $typeName, $className, $namespacePrefix);
+ $tail = ' for another namespace?';
+ } else {
+ $className = $fullyQualifiedClassName;
+ $message = sprintf('Attempted to load %s "%s" from the global namespace.', $typeName, $className);
+ $tail = '?';
}
- foreach (['class', 'interface', 'trait'] as $typeName) {
- $prefix = ucfirst($typeName).' \'';
- $prefixLen = \strlen($prefix);
- if (0 !== strpos($message, $prefix)) {
- continue;
- }
-
- $fullyQualifiedClassName = substr($message, $prefixLen, -$notFoundSuffixLen);
- if (false !== $namespaceSeparatorIndex = strrpos($fullyQualifiedClassName, '\\')) {
- $className = substr($fullyQualifiedClassName, $namespaceSeparatorIndex + 1);
- $namespacePrefix = substr($fullyQualifiedClassName, 0, $namespaceSeparatorIndex);
- $message = sprintf('Attempted to load %s "%s" from namespace "%s".', $typeName, $className, $namespacePrefix);
- $tail = ' for another namespace?';
+ if ($candidates = $this->getClassCandidates($className)) {
+ $tail = array_pop($candidates).'"?';
+ if ($candidates) {
+ $tail = ' for e.g. "'.implode('", "', $candidates).'" or "'.$tail;
} else {
- $className = $fullyQualifiedClassName;
- $message = sprintf('Attempted to load %s "%s" from the global namespace.', $typeName, $className);
- $tail = '?';
+ $tail = ' for "'.$tail;
}
-
- if ($candidates = $this->getClassCandidates($className)) {
- $tail = array_pop($candidates).'"?';
- if ($candidates) {
- $tail = ' for e.g. "'.implode('", "', $candidates).'" or "'.$tail;
- } else {
- $tail = ' for "'.$tail;
- }
- }
- $message .= "\nDid you forget a \"use\" statement".$tail;
-
- return new ClassNotFoundError($message, $error);
}
+ $message .= "\nDid you forget a \"use\" statement".$tail;
- return null;
+ return new ClassNotFoundError($message, $error);
}
/**
diff --git a/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/ClassNotFoundErrorEnhancerTest.php b/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/ClassNotFoundErrorEnhancerTest.php
index eefba23fa6b47..1ca2f162b9eb1 100644
--- a/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/ClassNotFoundErrorEnhancerTest.php
+++ b/src/Symfony/Component/ErrorHandler/Tests/ErrorEnhancer/ClassNotFoundErrorEnhancerTest.php
@@ -81,14 +81,30 @@ public function provideClassNotFoundData()
$debugClassLoader = new DebugClassLoader([$autoloader, 'loadClass']);
return [
+ [
+ 'Class "WhizBangFactory" not found',
+ "Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement?",
+ ],
[
'Class \'WhizBangFactory\' not found',
"Attempted to load class \"WhizBangFactory\" from the global namespace.\nDid you forget a \"use\" statement?",
],
+ [
+ 'Class "Foo\\Bar\\WhizBangFactory" not found',
+ "Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
+ ],
[
'Class \'Foo\\Bar\\WhizBangFactory\' not found',
"Attempted to load class \"WhizBangFactory\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
],
+ [
+ 'Interface "Foo\\Bar\\WhizBangInterface" not found',
+ "Attempted to load interface \"WhizBangInterface\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
+ ],
+ [
+ 'Trait "Foo\\Bar\\WhizBangTrait" not found',
+ "Attempted to load trait \"WhizBangTrait\" from namespace \"Foo\\Bar\".\nDid you forget a \"use\" statement for another namespace?",
+ ],
[
'Class \'UndefinedFunctionError\' not found',
"Attempted to load class \"UndefinedFunctionError\" from the global namespace.\nDid you forget a \"use\" statement for \"Symfony\Component\ErrorHandler\Error\UndefinedFunctionError\"?",
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy