bug #45258 [DependencyInjection] Don't dump polyfilled classes in preload script (nicolas-grekas)

chalasr · chalasr · commit c112bf116f8d · 2022-01-31T20:14:28.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [DependencyInjection] Don't dump polyfilled classes in preload script | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #44866 | License | MIT | Doc PR | - Commits ------- c11d664 [DependencyInjection] Don't dump polyfilled classes in preload script
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -316,7 +316,7 @@ public function dump(array $options = [])
                     if (!$class || str_contains($class, '$')) {
                         continue;
                     }
-                    if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || (new \ReflectionClass($class))->isUserDefined()) {
+                    if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || ((new \ReflectionClass($class))->isUserDefined() && !\in_array($class, ['Attribute', 'JsonException', 'ReturnTypeWillChange', 'Stringable', 'UnhandledMatchError', 'ValueError'], true))) {
                         $code[$options['class'].'.preload.php'] .= sprintf("\$classes[] = '%s';\n", $class);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ public function dump(array $options = [])`
`316`	`316`	`if (!$class \|\| str_contains($class, '$')) {`
`317`	`317`	`continue;`
`318`	`318`	`}`
`319`		`- if (!(class_exists($class, false) \|\| interface_exists($class, false) \|\| trait_exists($class, false)) \|\| (new \ReflectionClass($class))->isUserDefined()) {`
	`319`	`+ if (!(class_exists($class, false) \|\| interface_exists($class, false) \|\| trait_exists($class, false)) \|\| ((new \ReflectionClass($class))->isUserDefined() && !\in_array($class, ['Attribute', 'JsonException', 'ReturnTypeWillChange', 'Stringable', 'UnhandledMatchError', 'ValueError'], true))) {`
`320`	`320`	`$code[$options['class'].'.preload.php'] .= sprintf("\$classes[] = '%s';\n", $class);`
`321`	`321`	`}`
`322`	`322`	`}`