Use symfony yaml loader instead of PrestaShop module loader because t…

…he resolver is not correctly set wehn necessary
mvorisek · Jun 22, 2020 · ba29eb4 · ba29eb4
1 parent 350f935
commit ba29eb4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/Adapter/Module/Tab/ModuleTabRegister.php b/src/Adapter/Module/Tab/ModuleTabRegister.php
@@ -30,8 +30,8 @@
 use PrestaShop\PrestaShop\Adapter\Module\Module;
 use PrestaShopBundle\Entity\Repository\LangRepository;
 use PrestaShopBundle\Entity\Repository\TabRepository;
-use PrestaShopBundle\Routing\YamlModuleLoader;
 use Psr\Log\LoggerInterface;
+use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Finder\Finder;
 use Symfony\Component\Finder\SplFileInfo;
@@ -82,9 +82,9 @@ class ModuleTabRegister
     private $languages;
 
     /**
-     * @var YamlModuleLoader
+     * @var LoaderInterface
      */
-    private $moduleRoutingLoader;
+    private $routingConfigLoader;
 
     /**
      * @param TabRepository $tabRepository
@@ -93,7 +93,7 @@ class ModuleTabRegister
      * @param TranslatorInterface $translator
      * @param Filesystem $filesystem
      * @param array $languages
-     * @param YamlModuleLoader $moduleRoutingLoader
+     * @param LoaderInterface $routingConfigLoader
      */
     public function __construct(
         TabRepository $tabRepository,
@@ -102,15 +102,15 @@ public function __construct(
         TranslatorInterface $translator,
         Filesystem $filesystem,
         array $languages,
-        YamlModuleLoader $moduleRoutingLoader
+        LoaderInterface $routingConfigLoader
     ) {
         $this->langRepository = $langRepository;
         $this->tabRepository = $tabRepository;
         $this->logger = $logger;
         $this->translator = $translator;
         $this->filesystem = $filesystem;
         $this->languages = $languages;
-        $this->moduleRoutingLoader = $moduleRoutingLoader;
+        $this->routingConfigLoader = $routingConfigLoader;
     }
 
     /**
@@ -270,7 +270,7 @@ protected function getModuleControllersFromRouting(string $moduleName): array
         }
 
         $routingControllers = [];
-        $moduleRoutes = $this->moduleRoutingLoader->import($routingFile, 'module');
+        $moduleRoutes = $this->routingConfigLoader->import($routingFile, 'yaml');
         foreach ($moduleRoutes->getIterator() as $route) {
             $legacyController = $route->getDefault('_legacy_controller');
             if (!empty($legacyController)) {

diff --git a/src/PrestaShopBundle/Resources/config/services/adapter/module.yml b/src/PrestaShopBundle/Resources/config/services/adapter/module.yml
@@ -20,7 +20,7 @@ services:
             - "@translator"
             - "@filesystem"
             - "@=service('prestashop.adapter.legacy.context').getLanguages()"
-            - "@prestashop.bundle.routing.module_route_loader"
+            - "@routing.loader.yml"
 
     prestashop.adapter.module.tab.unregister:
         class: PrestaShop\PrestaShop\Adapter\Module\Tab\ModuleTabUnregister

diff --git a/tests-legacy/Unit/Adapter/Module/Tab/ModuleTabRegisterTest.php b/tests-legacy/Unit/Adapter/Module/Tab/ModuleTabRegisterTest.php
@@ -29,6 +29,7 @@
 use LegacyTests\TestCase\UnitTestCase;
 use PrestaShop\PrestaShop\Adapter\Module\Tab\ModuleTabRegister;
 use PrestaShopBundle\Routing\YamlModuleLoader;
+use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\ParameterBag;
 use Symfony\Component\Routing\Route;
@@ -154,7 +155,7 @@ protected function setUp()
                 $this->sfKernel->getContainer()->get('translator'),
                 $this->buildFilesystemMock(),
                 $this->languages,
-                $this->buildYamlModuleLoaderMock(),
+                $this->buildRoutingConfigLoaderMock(),
             ))
             ->getMock();
         $this->tabRegister
@@ -186,15 +187,15 @@ protected function buildFilesystemMock()
         return $filesystemMock;
     }
 
-    protected function buildYamlModuleLoaderMock()
+    protected function buildRoutingConfigLoaderMock()
     {
-        $moduleRoutingLoader = $this->getMockBuilder(YamlModuleLoader::class)
-            ->setMethods(['import'])
+        $moduleRoutingLoader = $this->getMockBuilder(LoaderInterface::class)
+            ->setMethods(['import', 'load', 'supports', 'getResolver', 'setResolver'])
             ->disableOriginalConstructor()
             ->getMock()
         ;
 
-        // We only need to mock the import method, it returns a RouteCollection, by default it returns a useless
+        // We only need to mock the import method, it returns a RouteCollection, by default the mock returns a useless
         // Route object, but ONLY for the undeclared_symfony module it returns an additional one with the _legacy_controller
         // option that will add an undeclared controller
         $moduleRoutingLoader