[DI] cascade preloading only to public parameters/properties

symfony · Sep 10, 2019 · 0e3ea8f · 0e3ea8f
1 parent 3536b13
commit 0e3ea8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
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;
 }
 
 /**