Merge branch '5.4' into 6.0

* 5.4:
  [VarDumper] Backport type fixes
  [Ldap] Backport refactorings
  [DependencyInjection] Optimize PHP preloading
  Introduced new method for getting bundles config path

Author: nicolas-grekas

Dumper/PhpDumper.php

@@ -337,7 +337,7 @@ class %s extends {$options['class']}
 
                 $code[$options['class'].'.preload.php'] .= <<<'EOF'
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
 EOF;
             }

Dumper/Preloader.php

@@ -34,10 +34,10 @@ public static function append(string $file, array $list): void
             $classes[] = sprintf("\$classes[] = %s;\n", var_export($item, true));
         }
 
-        file_put_contents($file, sprintf("\n\$classes = [];\n%sPreloader::preload(\$classes);\n", implode('', $classes)), \FILE_APPEND);
+        file_put_contents($file, sprintf("\n\$classes = [];\n%s\$preloaded = Preloader::preload(\$classes, \$preloaded);\n", implode('', $classes)), \FILE_APPEND);
     }
 
-    public static function preload(array $classes): void
+    public static function preload(array $classes, array $preloaded = []): array
     {
         set_error_handler(function ($t, $m, $f, $l) {
             if (error_reporting() & $t) {
@@ -50,7 +50,6 @@ public static function preload(array $classes): void
         });
 
         $prev = [];
-        $preloaded = [];
 
         try {
             while ($prev !== $classes) {
@@ -65,6 +64,8 @@ public static function preload(array $classes): void
         } finally {
             restore_error_handler();
         }
+
+        return $preloaded;
     }
 
     private static function doPreload(string $class, array &$preloaded): void
@@ -76,6 +77,10 @@ private static function doPreload(string $class, array &$preloaded): void
         $preloaded[$class] = true;
 
         try {
+            if (!class_exists($class) && !interface_exists($class, false) && !trait_exists($class, false)) {
+                return;
+            }
+
             $r = new \ReflectionClass($class);
 
             if ($r->isInternal()) {

Tests/Fixtures/php/services10_as_files.txt

@@ -138,7 +138,7 @@ $classes = [];
 $classes[] = 'FooClass';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php
 

Tests/Fixtures/php/services9_as_files.txt

@@ -938,7 +938,7 @@ $classes[] = 'Some\Sidekick2';
 $classes[] = 'Request';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php
 

Tests/Fixtures/php/services9_inlined_factories.txt

@@ -569,7 +569,7 @@ $classes[] = 'Some\Sidekick2';
 $classes[] = 'Request';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php
 

Tests/Fixtures/php/services9_lazy_inlined_factories.txt

@@ -169,7 +169,7 @@ $classes[] = 'Bar\FooClass';
 $classes[] = 'Bar\FooLazyClass';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php
 

Tests/Fixtures/php/services_non_shared_lazy_as_files.txt

@@ -138,7 +138,7 @@ $classes = [];
 $classes[] = 'Bar\FooLazyClass';
 $classes[] = 'Symfony\Component\DependencyInjection\ContainerInterface';
 
-Preloader::preload($classes);
+$preloaded = Preloader::preload($classes);
 
     [ProjectServiceContainer.php] => <?php