Made possible to inject any (e.g. mocked) container into Controller

Leoche · Apr 17, 2018 · 9a29980 · 9a29980
1 parent 27c3822
commit 9a29980
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php
@@ -164,7 +164,9 @@ public function init()
             define('_PS_BASE_URL_SSL_', Tools::getShopDomainSsl(true));
         }
 
-        $this->container              = $this->buildContainer();
+        if (null === $this->container) {
+            $this->container = $this->buildContainer();
+        }
         $localeRepo                   = $this->get(self::SERVICE_LOCALE_REPOSITORY);
         $this->context->currentLocale = $localeRepo->getLocale($this->context->language->locale);
     }
@@ -735,4 +737,16 @@ public function getContainer()
     {
         return $this->container;
     }
+
+    /**
+     * @param ContainerBuilder $container
+     *
+     * @return $this
+     */
+    public function setContainer($container)
+    {
+        $this->container = $container;
+
+        return $this;
+    }
 }