minor symfony#50102 [ErrorHandler] Avoid compile crash while trying to find candidate when a class is not found (lyrixx)

fabpot · fabpot · commit 1cfb6012af39 · 2023-07-13T14:43:34.000+02:00
This PR was submitted for the 5.4 branch but it was merged into the 6.4 branch instead. Discussion ---------- [ErrorHandler] Avoid compile crash while trying to find candidate when a class is not found | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | | License | MIT | Doc PR | --- ## Before ![image](https://user-images.githubusercontent.com/408368/233658400-7e6fa6e9-3798-4cbb-a5ee-3a81e714d37d.png) ## After ![image](https://user-images.githubusercontent.com/408368/233658515-8f4c1b81-86cf-4d87-a25f-d63b025e37fb.png) Commits ------- fd1f4af [ErrorHandler] Avoid compile crash while trying to find candidate when a class is not found
diff --git a/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php b/src/Symfony/Component/ErrorHandler/ErrorEnhancer/ClassNotFoundErrorEnhancer.php
@@ -152,6 +152,14 @@ private function convertFileToClass(string $path, string $file, string $prefix):
             }
         }
 
+        // Symfony may ship some polyfills, like "Normalizer". But if the Intl
+        // extension is already installed, the next require_once will fail with
+        // a compile error because the class is already defined. And this one
+        // does not throw a Throwable. So it's better to skip it here.
+        if (str_contains($file, 'Resources/stubs')) {
+            return null;
+        }
+
         try {
             require_once $file;
         } catch (\Throwable) {

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,14 @@ private function convertFileToClass(string $path, string $file, string $prefix):`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
	`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`	`+`
`155`	`163`	`try {`
`156`	`164`	`require_once $file;`
`157`	`165`	`} catch (\Throwable) {`