Clean up and simplify lazy resource initialization

symfony · mpdude · Jun 3, 2017 · Jun 3, 2017 · Jun 3, 2017 · Jun 5, 2017
commit 31c245dfd5e16395d116c158b9502d6d16ca8e4f
diff --git a/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php b/src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
@@ -38,13 +38,12 @@ class Translator extends BaseTranslator implements WarmableInterface
    private $resourceLocales;

    /**
-     * Holds parameters from addResource() calls so we can add these resources
-     * after the ones passed in the resource_files option (which are added
-     * lazily in loadResources() as well).
+     * Holds parameters from addResource() calls so we can defer the acutal
+     * parent::addResource() calls until initialize() is executed.
     *
     * @var array
     */
-    private $otherResources = array();
+    private $resources = array();

    /**
     * Constructor.
@@ -74,9 +73,7 @@ public function __construct(ContainerInterface $container, MessageSelector $sele

        $this->options = array_merge($this->options, $options);
        $this->resourceLocales = array_keys($this->options['resource_files']);
-        if (null !== $this->options['cache_dir'] && $this->options['debug']) {
-            $this->loadResources();
-        }
+        $this->addResourceFiles($this->options['resource_files']);

        parent::__construct($container->getParameter('kernel.default_locale'), $selector, $this->options['cache_dir'], $this->options['debug']);
    }
@@ -104,7 +101,7 @@ public function warmUp($cacheDir)

    public function addResource($format, $resource, $locale, $domain = null)
    {
-        $this->otherResources[] = array($format, $resource, $locale, $domain);
+        $this->resources[] = array($format, $resource, $locale, $domain);
    }

    /**
@@ -118,29 +115,27 @@ protected function initializeCatalogue($locale)

    protected function initialize()
    {
-        $this->loadResources();
+        foreach ($this->resources as $key => $params) {
+            list($format, $resource, $locale, $domain) = $params;
+            parent::addResource($format, $resource, $locale, $domain);
+        }
+        $this->resources = array();
+
        foreach ($this->loaderIds as $id => $aliases) {
            foreach ($aliases as $alias) {
                $this->addLoader($alias, $this->container->get($id));
            }
        }
    }

-    private function loadResources()
+    private function addResourceFiles($filesByLocale)
    {
-        foreach ($this->options['resource_files'] as $locale => $files) {
+        foreach ($filesByLocale as $locale => $files) {
            foreach ($files as $key => $file) {
                // filename is domain.locale.format
                list($domain, $locale, $format) = explode('.', basename($file), 3);
-                parent::addResource($format, $file, $locale, $domain);
-                unset($this->options['resource_files'][$locale][$key]);
+                $this->addResource($format, $file, $locale, $domain);
            }
        }
-
-        foreach ($this->otherResources as $key => $params) {
-            list($format, $resource, $locale, $domain) = $params;
-            parent::addResource($format, $resource, $locale, $domain);
-            unset($this->otherResources[$key]);
-        }
    }
 }