minor #33541 [DI] cascade preloading only to public parameters/properties (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit f0aff8c4d58d · 2019-09-10T19:58:49.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [DI] cascade preloading only to public parameters/properties | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - This removes `ContaierBuilder`, `RouteCollectionBuilder`, etc. coming from `App\Kernel` Commits ------- 0e3ea8f [DI] cascade preloading only to public parameters/properties
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/Preloader.php b/src/Symfony/Component/DependencyInjection/Dumper/Preloader.php
@@ -67,14 +67,14 @@ private static function doPreload(string $class, array &$preloaded)
             $r->getDefaultProperties();
 
             if (\PHP_VERSION_ID >= 70400) {
-                foreach ($r->getProperties() as $p) {
+                foreach ($r->getProperties(\ReflectionProperty::IS_PUBLIC) as $p) {
                     if (($t = $p->getType()) && !$t->isBuiltin()) {
                         self::doPreload($t->getName(), $preloaded);
                     }
                 }
             }
 
-            foreach ($r->getMethods() as $m) {
+            foreach ($r->getMethods(\ReflectionMethod::IS_PUBLIC) as $m) {
                 foreach ($m->getParameters() as $p) {
                     if ($p->isDefaultValueAvailable() && $p->isDefaultValueConstant()) {
                         $c = $p->getDefaultValueConstantName();
diff --git a/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php b/src/Symfony/Component/DependencyInjection/ExpressionLanguage.php
@@ -15,7 +15,7 @@
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;
 
 if (!class_exists(BaseExpressionLanguage::class)) {
-    throw new \ReflectionException(BaseExpressionLanguage::class.' not found.');
+    return;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -67,14 +67,14 @@ private static function doPreload(string $class, array &$preloaded)`
`67`	`67`	`$r->getDefaultProperties();`
`68`	`68`
`69`	`69`	`if (\PHP_VERSION_ID >= 70400) {`
`70`		`- foreach ($r->getProperties() as $p) {`
	`70`	`+ foreach ($r->getProperties(\ReflectionProperty::IS_PUBLIC) as $p) {`
`71`	`71`	`if (($t = $p->getType()) && !$t->isBuiltin()) {`
`72`	`72`	`self::doPreload($t->getName(), $preloaded);`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- foreach ($r->getMethods() as $m) {`
	`77`	`+ foreach ($r->getMethods(\ReflectionMethod::IS_PUBLIC) as $m) {`
`78`	`78`	`foreach ($m->getParameters() as $p) {`
`79`	`79`	`if ($p->isDefaultValueAvailable() && $p->isDefaultValueConstant()) {`
`80`	`80`	`$c = $p->getDefaultValueConstantName();`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`use Symfony\Component\ExpressionLanguage\ExpressionLanguage as BaseExpressionLanguage;`
`16`	`16`
`17`	`17`	`if (!class_exists(BaseExpressionLanguage::class)) {`
`18`		`- throw new \ReflectionException(BaseExpressionLanguage::class.' not found.');`
	`18`	`+ return;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/**`