Use Core hook dispatcher in Module manager + refacto

PrestaShop · Aug 17, 2018 · 443963b · 443963b
1 parent 8164557
commit 443963b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 22 deletions.
diff --git a/src/Core/Addon/Module/ModuleManager.php b/src/Core/Addon/Module/ModuleManager.php
@@ -25,7 +25,6 @@
  */
 namespace PrestaShop\PrestaShop\Core\Addon\Module;
 
-use Employee;
 use Exception;
 use PrestaShop\PrestaShop\Adapter\Module\AdminModuleDataProvider;
 use PrestaShop\PrestaShop\Adapter\Module\Module;
@@ -36,7 +35,7 @@
 use PrestaShop\PrestaShop\Core\Addon\AddonsCollection;
 use PrestaShop\PrestaShop\Core\Addon\Module\Exception\UnconfirmedModuleActionException;
 use PrestaShopBundle\Event\ModuleManagementEvent;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use PrestaShop\PrestaShop\Core\Hook\HookDispatcherInterface;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\Translation\TranslatorInterface;
 
@@ -77,14 +76,9 @@ class ModuleManager implements AddonManagerInterface
     private $translator;
 
     /**
-     * @var Employee Legacy employee class
+     * @var HookDispatcherInterface
      */
-    private $employee;
-
-    /**
-     * @var EventDispatcherInterface
-     */
-    private $dispatcher;
+    private $hookDispatcher;
 
     /**
      * Additionnal data used for module actions
@@ -94,13 +88,13 @@ class ModuleManager implements AddonManagerInterface
     private $actionParams;
 
     /**
-     * @param AdminModuleDataProvider $adminModulesProvider
+     * @param AdminModuleDataProvider $adminModuleProvider
      * @param ModuleDataProvider $modulesProvider
      * @param ModuleDataUpdater $modulesUpdater
      * @param ModuleRepository $moduleRepository
      * @param ModuleZipManager $moduleZipManager
      * @param TranslatorInterface $translator
-     * @param Employee|null $employee
+     * @param HookDispatcherInterface $hookDispatcher
      */
     public function __construct(
         AdminModuleDataProvider $adminModuleProvider,
@@ -109,8 +103,7 @@ public function __construct(
         ModuleRepository $moduleRepository,
         ModuleZipManager $moduleZipManager,
         TranslatorInterface $translator,
-        EventDispatcherInterface $dispatcher,
-        Employee $employee = null
+        HookDispatcherInterface $hookDispatcher
         )
     {
         $this->adminModuleProvider = $adminModuleProvider;
@@ -119,8 +112,7 @@ public function __construct(
         $this->moduleRepository = $moduleRepository;
         $this->moduleZipManager = $moduleZipManager;
         $this->translator = $translator;
-        $this->employee = $employee;
-        $this->dispatcher = $dispatcher;
+        $this->hookDispatcher = $hookDispatcher;
 
         $this->actionParams = new ParameterBag();
     }
@@ -624,12 +616,12 @@ public function getError($name)
 
     /**
      * This function is a refacto of the event dispatching
-     * @param strig $event
+     * @param string $event
      * @param \PrestaShop\PrestaShop\Core\Addon\Module\Module $module
      */
     private function dispatch($event, $module)
     {
-        $this->dispatcher->dispatch($event, new ModuleManagementEvent($module));
+        $this->hookDispatcher->dispatchWithParameters($event, new ModuleManagementEvent($module));
     }
 
     private function checkIsInstalled($name)

diff --git a/src/Core/Addon/Module/ModuleManagerBuilder.php b/src/Core/Addon/Module/ModuleManagerBuilder.php
@@ -98,8 +98,7 @@ public function build()
                 $this->buildRepository(),
                 self::$moduleZipManager,
                 self::$translator,
-                new NullDispatcher(),
-                Context::getContext()->employee
+                new NullDispatcher()
             );
         }
     }

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
@@ -47,7 +47,6 @@ services:
             - "@prestashop.module.zip.manager"
             - "@translator"
             - "@event_dispatcher"
-            - "@=service('prestashop.adapter.legacy.context').getContext().employee"
 
     prestashop.module.zip.manager:
         class: PrestaShop\PrestaShop\Adapter\Module\ModuleZipManager

diff --git a/tests/Unit/Core/Addon/Module/ModuleManagerTest.php b/tests/Unit/Core/Addon/Module/ModuleManagerTest.php
@@ -56,8 +56,7 @@ public function setUp()
             $this->moduleRepositoryS,
             $this->moduleZipManagerS,
             $this->translatorS,
-            $this->dispatcherS,
-            $this->employeeS
+            $this->dispatcherS
         );
     }