[FrameworkBundle] Compute list of early-declared classes in ClassCacheCacheWarmer

nicolas-grekas · nicolas-grekas · commit 3225370f9382 · 2016-07-06T08:45:25.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ClassCacheCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ClassCacheCacheWarmer.php
@@ -21,6 +21,13 @@
  */
 class ClassCacheCacheWarmer implements CacheWarmerInterface
 {
+    private $firstDeclaredClass;
+
+    public function __construct($firstDeclaredClass = null)
+    {
+        $this->firstDeclaredClass = $firstDeclaredClass;
+    }
+
     /**
      * Warms up the cache.
      *
@@ -37,8 +44,27 @@ public function warmUp($cacheDir)
         if (file_exists($cacheDir.'/classes.php')) {
             return;
         }
+        $declared = false;
+
+        if (null !== $this->firstDeclaredClass && class_exists($this->firstDeclaredClass, false)) {
+            $file = new \ReflectionClass($this->firstDeclaredClass);
+            $file = $file->getFileName();
+            $includedFiles = get_included_files();
+
+            if (false !== $classIndex = array_search($file, $includedFiles)) {
+                $includedFiles = array_slice($includedFiles, 0, 1 + $classIndex);
+                $includedFiles = array_flip($includedFiles);
+
+                $declared = array_merge(get_declared_classes(), get_declared_interfaces(), get_declared_traits());
+                $declared = array_filter($declared, function ($class) use ($includedFiles) {
+                    $r = new \ReflectionClass($class);
+
+                    return $r->isUserDefined() && isset($includedFiles[$r->getFileName()]);
+                });
+            }
+        }
 
-        ClassCollectionLoader::load(include($classmap), $cacheDir, 'classes', false);
+        ClassCollectionLoader::load(include($classmap), $cacheDir, 'classes', false, $declared);
     }
 
     /**
diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml
@@ -24,6 +24,7 @@
 
         <service id="kernel.class_cache.cache_warmer" class="Symfony\Bundle\FrameworkBundle\CacheWarmer\ClassCacheCacheWarmer">
             <tag name="kernel.cache_warmer" />
+            <argument>Symfony\Bundle\FrameworkBundle\FrameworkBundle</argument>
         </service>
 
         <service id="cache_clearer" class="Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer">
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -19,7 +19,7 @@
         "php": ">=5.5.9",
         "symfony/asset": "~2.8|~3.0",
         "symfony/cache": "~3.1",
-        "symfony/class-loader": "~2.8|~3.0",
+        "symfony/class-loader": "~3.2",
         "symfony/dependency-injection": "~3.2",
         "symfony/config": "~2.8|~3.0",
         "symfony/event-dispatcher": "~2.8|~3.0",
