Skip to content

Commit 1f7a196

Browse files
Merge branch '6.4' into 7.0
* 6.4: Update FileProfilerStorage.php [Security] Allow custom scheme to be used as redirection URIs [Validator] Do not mock metadata factory on debug command tests [HttpKernel][WebProfilerBundle] Fix search feature [ErrorHandler] Avoid compile crash while trying to find candidate when a class is not found [Security] Make `PersistentToken` immutable and tell `TokenProviderInterface::updateToken()` implementations should accept `DateTimeInterface` do not listen to signals if the pcntl extension is missing [DependencyInjection] Improve reporting named autowiring aliases [DependencyInjection] Make better use of memory and CPU during auto-discovery update Intl component to take into account B-variant when converting Alpha3 to Alpha2. fixing issue with Darwin. [VarDumper] Fix dumping `ArrayObject` with `DumpDataCollector` [VarDumper] Add tests to demonstrate a bug when dumping ArrayObject with full stack fmk [DebugBundle][FrameworkBundle] Fix using the framework without the Console component [FrameworkBundle] Add missing monolog channel tag to the `messenger:failed:retry` command fetch all known ChoiceType values at once [RateLimiter] fix incorrect retryAfter of FixedWindow Fix Finder phpdoc [TwigBundle] Allow omitting the `autoescape_service_method` option when `autoescape_service` is set to an invokable service id [PropertyAccess] Auto-cast from/to DateTime/Immutable when appropriate
2 parents f1c1d00 + 4be2642 commit 1f7a196

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

ErrorEnhancer/ClassNotFoundErrorEnhancer.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,14 @@ private function convertFileToClass(string $path, string $file, string $prefix):
152152
}
153153
}
154154

155+
// Symfony may ship some polyfills, like "Normalizer". But if the Intl
156+
// extension is already installed, the next require_once will fail with
157+
// a compile error because the class is already defined. And this one
158+
// does not throw a Throwable. So it's better to skip it here.
159+
if (str_contains($file, 'Resources/stubs')) {
160+
return null;
161+
}
162+
155163
try {
156164
require_once $file;
157165
} catch (\Throwable) {

0 commit comments

Comments
 (0)