more review feedback

symfony · dmaicher · Jul 17, 2017 · Jul 18, 2017 · Jul 18, 2017 · Jul 18, 2017
commit 73abab8a36d52e4e5fa30808d2c8323402042dad
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AbstractPhpFileCacheWarmer.php
@@ -52,21 +52,23 @@ public function isOptional()
      */
     public function warmUp($cacheDir)
     {
-        $phpArrayAdapter = new PhpArrayAdapter($this->phpArrayFile, $this->fallbackPool);
         $arrayAdapter = new ArrayAdapter();
 
-        spl_autoload_register(array($phpArrayAdapter, 'throwOnRequiredClass'));
+        spl_autoload_register(array(PhpArrayAdapter::class, 'throwOnRequiredClass'));
         try {
-            $this->doWarmUp($cacheDir, $arrayAdapter);
+            if (!$this->doWarmUp($cacheDir, $arrayAdapter)) {
+                return;
+            }
         } finally {
-            spl_autoload_unregister(array($phpArrayAdapter, 'throwOnRequiredClass'));
+            spl_autoload_unregister(array(PhpArrayAdapter::class, 'throwOnRequiredClass'));
         }
 
         // the ArrayAdapter stores the values serialized
         // to avoid mutation of the data after it was written to the cache
         // so here we un-serialize the values first
         $values = array_map(function ($val) { return null !== $val ? unserialize($val) : null; }, $arrayAdapter->getValues());
-        $this->warmUpPhpArrayAdapter($phpArrayAdapter, $values);
+
+        $this->warmUpPhpArrayAdapter(new PhpArrayAdapter($this->phpArrayFile, $this->fallbackPool), $values);
 
         foreach ($values as $k => $v) {
             $item = $this->fallbackPool->getItem($k);
@@ -83,6 +85,8 @@ protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array
     /**
      * @param string       $cacheDir
      * @param ArrayAdapter $arrayAdapter
+     *
+     * @return bool false if there is nothing to warm-up
      */
     abstract protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter);
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/AnnotationsCacheWarmer.php
@@ -47,7 +47,7 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
         $annotatedClassPatterns = $cacheDir.'/annotations.map';
 
         if (!is_file($annotatedClassPatterns)) {
-            return;
+            return true;
         }
 
         $annotatedClasses = include $annotatedClassPatterns;
@@ -69,6 +69,8 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
                  */
             }
         }
+
+        return true;
     }
 
     private function readAllComponents(Reader $reader, $class)

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/SerializerCacheWarmer.php
@@ -47,7 +47,7 @@ public function __construct(array $loaders, $phpArrayFile, CacheItemPoolInterfac
     protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
     {
         if (!class_exists(CacheClassMetadataFactory::class) || !method_exists(XmlFileLoader::class, 'getMappedClasses') || !method_exists(YamlFileLoader::class, 'getMappedClasses')) {
-            return;
+            return false;
         }
 
         $metadataFactory = new CacheClassMetadataFactory(new ClassMetadataFactory(new LoaderChain($this->loaders)), $arrayAdapter);
@@ -63,6 +63,8 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
                 }
             }
         }
+
+        return true;
     }
 
     /**

diff --git a/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php b/src/Symfony/Bundle/FrameworkBundle/CacheWarmer/ValidatorCacheWarmer.php
@@ -49,7 +49,7 @@ public function __construct(ValidatorBuilderInterface $validatorBuilder, $phpArr
     protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
     {
         if (!method_exists($this->validatorBuilder, 'getLoaders')) {
-            return;
+            return false;
         }
 
         $loaders = $this->validatorBuilder->getLoaders();
@@ -68,6 +68,8 @@ protected function doWarmUp($cacheDir, ArrayAdapter $arrayAdapter)
                 }
             }
         }
+
+        return true;
     }
 
     protected function warmUpPhpArrayAdapter(PhpArrayAdapter $phpArrayAdapter, array $values)