Merge pull request #203 from fox-john/fix/revert-autowire

fix: revert autowire service declarations

config/controllers.yml

@@ -0,0 +1,18 @@
+services:
+  _defaults:
+    public: false
+
+  PrestaShop\Module\Psgdpr\Controller\Admin\CustomerController:
+    class: 'PrestaShop\Module\Psgdpr\Controller\Admin\CustomerController'
+    public: true
+    arguments:
+      - "@prestashop.core.query_bus"
+      - '@PrestaShop\Module\Psgdpr\Repository\OrderInvoiceRepository'
+      - "@router"
+      - '@PrestaShop\Module\Psgdpr\Service\BackResponder\BackResponderFactory'
+
+  PrestaShop\Module\Psgdpr\Controller\Admin\DownloadCustomerInvoicesController:
+    class: 'PrestaShop\Module\Psgdpr\Controller\Admin\DownloadCustomerInvoicesController'
+    public: true
+    arguments:
+      - '@PrestaShop\Module\Psgdpr\Repository\OrderInvoiceRepository'

config/repositories.yml

@@ -0,0 +1,40 @@
+services:
+  _defaults:
+    public: false
+
+  PrestaShop\Module\Psgdpr\Repository\LoggerRepository:
+    class: 'PrestaShop\Module\Psgdpr\Repository\LoggerRepository'
+    public: true
+    arguments:
+      - "@Doctrine\\Persistence\\ManagerRegistry"
+
+  PrestaShop\Module\Psgdpr\Repository\CartRepository:
+    class: 'PrestaShop\Module\Psgdpr\Repository\CartRepository'
+    arguments:
+      - "@doctrine.dbal.default_connection"
+
+  PrestaShop\Module\Psgdpr\Repository\CartRuleRepository:
+    class: 'PrestaShop\Module\Psgdpr\Repository\CartRuleRepository'
+    arguments:
+      - "@doctrine.dbal.default_connection"
+
+  PrestaShop\Module\Psgdpr\Repository\CustomerRepository:
+    class: 'PrestaShop\Module\Psgdpr\Repository\CustomerRepository'
+    arguments:
+      - "@doctrine.dbal.default_connection"
+
+  PrestaShop\Module\Psgdpr\Repository\OrderRepository:
+    class: 'PrestaShop\Module\Psgdpr\Repository\OrderRepository'
+    arguments:
+      - "@doctrine.dbal.default_connection"
+
+  PrestaShop\Module\Psgdpr\Repository\OrderInvoiceRepository:
+    class: 'PrestaShop\Module\Psgdpr\Repository\OrderInvoiceRepository'
+    arguments:
+      - "@doctrine.dbal.default_connection"
+
+  PrestaShop\Module\Psgdpr\Repository\ConsentRepository:
+    class: 'PrestaShop\Module\Psgdpr\Repository\ConsentRepository'
+    public: true
+    arguments:
+      - "@Doctrine\\Persistence\\ManagerRegistry"

config/services.yml

@@ -1,76 +1,62 @@
-## Issue with autowiring of services ##
-# Automatic service resolution via "resource" parameter currently does not work, so we have to use intermediate way.
-# it will work when we PrestaShop 8.1 will be released
-# more informations here: https://symfony.com/doc/current/service_container/import.html
+imports:
+  - { resource: ./controllers.yml }
+  - { resource: ./repositories.yml }
 
 services:
   _defaults:
     public: false
-    autowire: true
-    autoconfigure: true
-    bind:
-      $context: '@=service("prestashop.adapter.legacy.context").getContext()'
-      $commandBus: "@prestashop.core.command_bus"
-      $queryBus: "@prestashop.core.query_bus"
-      $translator: '@=service("Psgdpr").getTranslator()'
-      $defaultGroupProvider: "@prestashop.adapter.group.provider.default_groups_provider"
-      $hashing: "@hashing"
 
-  ## SERVICES ##
   Psgdpr:
     class: "Psgdpr"
+    factory: ["Module", "getInstanceByName"]
+    arguments:
+      - "psgdpr"
 
   PrestaShop\Module\Psgdpr\Service\LoggerService:
     class: 'PrestaShop\Module\Psgdpr\Service\LoggerService'
+    arguments:
+      - "@PrestaShop\\Module\\Psgdpr\\Repository\\LoggerRepository"
+      - "@PrestaShop\\Module\\Psgdpr\\Repository\\CustomerRepository"
 
   PrestaShop\Module\Psgdpr\Service\ExportService:
     class: 'PrestaShop\Module\Psgdpr\Service\ExportService'
+    arguments:
+      - '@=service("prestashop.adapter.legacy.context").getContext()'
+      - '@=service("Psgdpr").getTranslator()'
 
   PrestaShop\Module\Psgdpr\Service\CustomerService:
     class: 'PrestaShop\Module\Psgdpr\Service\CustomerService'
-
-  ## REPOSITORIES ##
-  PrestaShop\Module\Psgdpr\Repository\LoggerRepository:
-    class: 'PrestaShop\Module\Psgdpr\Repository\LoggerRepository'
-
-  PrestaShop\Module\Psgdpr\Repository\CartRepository:
-    class: 'PrestaShop\Module\Psgdpr\Repository\CartRepository'
-
-  PrestaShop\Module\Psgdpr\Repository\CartRuleRepository:
-    class: 'PrestaShop\Module\Psgdpr\Repository\CartRuleRepository'
-
-  PrestaShop\Module\Psgdpr\Repository\CustomerRepository:
-    class: 'PrestaShop\Module\Psgdpr\Repository\CustomerRepository'
-
-  PrestaShop\Module\Psgdpr\Repository\OrderRepository:
-    class: 'PrestaShop\Module\Psgdpr\Repository\OrderRepository'
-
-  PrestaShop\Module\Psgdpr\Repository\OrderInvoiceRepository:
-    class: 'PrestaShop\Module\Psgdpr\Repository\OrderInvoiceRepository'
-
-  PrestaShop\Module\Psgdpr\Repository\ConsentRepository:
-    class: 'PrestaShop\Module\Psgdpr\Repository\ConsentRepository'
-
-  ## CONTROLLERS ##
-  PrestaShop\Module\Psgdpr\Controller\Admin\CustomerController:
-    class: 'PrestaShop\Module\Psgdpr\Controller\Admin\CustomerController'
-    public: true
-
-  PrestaShop\Module\Psgdpr\Controller\Admin\DownloadCustomerInvoicesController:
-    class: 'PrestaShop\Module\Psgdpr\Controller\Admin\DownloadCustomerInvoicesController'
-    public: true
+    arguments:
+      - "@Psgdpr"
+      - '@=service("prestashop.adapter.legacy.context").getContext()'
+      - '@PrestaShop\Module\Psgdpr\Repository\CartRepository'
+      - '@PrestaShop\Module\Psgdpr\Repository\CartRuleRepository'
+      - '@PrestaShop\Module\Psgdpr\Repository\CustomerRepository'
+      - "@prestashop.core.command_bus"
+      - "@prestashop.core.query_bus"
+      - "@prestashop.adapter.group.provider.default_groups_provider"
+      - "@hashing"
 
   PrestaShop\Module\Psgdpr\Service\Export\Strategy\ExportToCsv:
     class: 'PrestaShop\Module\Psgdpr\Service\Export\Strategy\ExportToCsv'
     tags: ["psgdpr.export.customerData"]
+    arguments:
+      - '@=service("prestashop.adapter.legacy.context").getContext()'
+      - '@PrestaShop\Module\Psgdpr\Service\LoggerService'
 
   PrestaShop\Module\Psgdpr\Service\Export\Strategy\ExportToPdf:
     class: 'PrestaShop\Module\Psgdpr\Service\Export\Strategy\ExportToPdf'
     tags: ["psgdpr.export.customerData"]
+    arguments:
+      - '@=service("prestashop.adapter.legacy.context").getContext()'
+      - '@PrestaShop\Module\Psgdpr\Service\LoggerService'
 
   PrestaShop\Module\Psgdpr\Service\Export\Strategy\ExportToJson:
     class: 'PrestaShop\Module\Psgdpr\Service\Export\Strategy\ExportToJson'
     tags: ["psgdpr.export.customerData"]
+    arguments:
+      - '@=service("prestashop.adapter.legacy.context").getContext()'
+      - '@PrestaShop\Module\Psgdpr\Service\LoggerService'
 
   PrestaShop\Module\Psgdpr\Service\Export\ExportFactory:
     class: 'PrestaShop\Module\Psgdpr\Service\Export\ExportFactory'
@@ -80,27 +66,34 @@ services:
   PrestaShop\Module\Psgdpr\Service\BackResponder\Strategy\BackResponderByCustomerId:
     class: 'PrestaShop\Module\Psgdpr\Service\BackResponder\Strategy\BackResponderByCustomerId'
     tags: ["psgdpr.export.backResponder"]
+    arguments:
+      - '@PrestaShop\Module\Psgdpr\Service\Export\ExportFactory'
+      - '@PrestaShop\Module\Psgdpr\Repository\CustomerRepository'
+      - '@PrestaShop\Module\Psgdpr\Service\CustomerService'
+      - '@PrestaShop\Module\Psgdpr\Service\LoggerService'
+      - '@PrestaShop\Module\Psgdpr\Service\ExportService'
 
   PrestaShop\Module\Psgdpr\Service\BackResponder\Strategy\BackResponderByEmail:
     class: 'PrestaShop\Module\Psgdpr\Service\BackResponder\Strategy\BackResponderByEmail'
     tags: ["psgdpr.export.backResponder"]
+    arguments:
+      - '@PrestaShop\Module\Psgdpr\Service\Export\ExportFactory'
+      - '@PrestaShop\Module\Psgdpr\Repository\CustomerRepository'
+      - '@PrestaShop\Module\Psgdpr\Service\CustomerService'
+      - '@PrestaShop\Module\Psgdpr\Service\LoggerService'
+      - '@PrestaShop\Module\Psgdpr\Service\ExportService'
 
   PrestaShop\Module\Psgdpr\Service\BackResponder\Strategy\BackResponderByPhone:
     class: 'PrestaShop\Module\Psgdpr\Service\BackResponder\Strategy\BackResponderByPhone'
     tags: ["psgdpr.export.backResponder"]
+    arguments:
+      - '@PrestaShop\Module\Psgdpr\Service\Export\ExportFactory'
+      - '@PrestaShop\Module\Psgdpr\Repository\CustomerRepository'
+      - '@PrestaShop\Module\Psgdpr\Service\CustomerService'
+      - '@PrestaShop\Module\Psgdpr\Service\LoggerService'
+      - '@PrestaShop\Module\Psgdpr\Service\ExportService'
 
   PrestaShop\Module\Psgdpr\Service\BackResponder\BackResponderFactory:
     class: 'PrestaShop\Module\Psgdpr\Service\BackResponder\BackResponderFactory'
     arguments:
       - !tagged_iterator psgdpr.export.backResponder
-
-  ## old binding with this->get() ##
-  psgdpr.repository.consent:
-    alias: 'PrestaShop\Module\Psgdpr\Repository\ConsentRepository'
-    public: true
-    deprecated: ~
-
-  psgdpr.repository.logger:
-    alias: 'PrestaShop\Module\Psgdpr\Repository\LoggerRepository'
-    public: true
-    deprecated: ~

psgdpr.php

@@ -262,7 +262,7 @@ public function getContent()
         $router = $this->get('router');
 
         /** @var LoggerRepository $loggerRepository */
-        $loggerRepository = $this->get('psgdpr.repository.logger');
+        $loggerRepository = $this->get('PrestaShop\Module\Psgdpr\Repository\LoggerRepository');
 
         $moduleAdminLink = $this->context->link->getAdminLink('AdminModules', true, [], ['configure' => $this->name]);
 
@@ -434,7 +434,7 @@ public function postProcess()
     private function submitDataConsent()
     {
         /** @var ConsentRepository $consentRepository */
-        $consentRepository = $this->get('psgdpr.repository.consent');
+        $consentRepository = $this->get('PrestaShop\Module\Psgdpr\Repository\ConsentRepository');
 
         if (Tools::isSubmit('submitDataConsent')) {
             /** @var LangRepository $langRepository */
@@ -489,7 +489,7 @@ private function submitDataConsent()
     private function loadRegisteredModules(): array
     {
         /** @var ConsentRepository $consentRepository */
-        $consentRepository = $this->get('psgdpr.repository.consent');
+        $consentRepository = $this->get('PrestaShop\Module\Psgdpr\Repository\ConsentRepository');
 
         $languages = Language::getLanguages(false);
         $moduleList = $consentRepository->findAllRegisteredModules();
@@ -554,7 +554,7 @@ private function addModuleConsent(array $module): void
         $langRepository = $this->get('prestashop.core.admin.lang.repository');
 
         /** @var ConsentRepository $consentRepository */
-        $consentRepository = $this->get('psgdpr.repository.consent');
+        $consentRepository = $this->get('PrestaShop\Module\Psgdpr\Repository\ConsentRepository');
 
         $languages = $langRepository->findAll();
         $shopId = $this->context->shop->id;

src/Repository/OrderInvoiceRepository.php

@@ -59,7 +59,7 @@ public function findIfInvoicesExistByCustomerId(CustomerId $customerId): bool
 
         $result = $query->execute();
 
-        if ($result->fetchOne() === 0) {
+        if ($result->fetchOne() == 0) {
             return false;
         }
 

src/Service/BackResponder/BackResponderContext.php

@@ -51,19 +51,19 @@ abstract class BackResponderContext
     /**
      * @var ExportService
      */
-    protected $exportCustomerDataService;
+    protected $exportService;
 
     public function __construct(
         ExportFactory $exportFactory,
         CustomerRepository $customerRepository,
         CustomerService $customerService,
         LoggerService $loggerService,
-        ExportService $exportCustomerDataService
+        ExportService $exportService
     ) {
         $this->exportFactory = $exportFactory;
         $this->customerRepository = $customerRepository;
         $this->customerService = $customerService;
         $this->loggerService = $loggerService;
-        $this->exportCustomerDataService = $exportCustomerDataService;
+        $this->exportService = $exportService;
     }
 }

src/Service/BackResponder/Strategy/BackResponderByCustomerId.php

@@ -45,7 +45,7 @@ public function export(string $data): Response
 
         $exportStrategy = $this->exportFactory->getStrategyByType(ExportToJson::TYPE);
 
-        $result = $this->exportCustomerDataService->exportCustomerData($customerId, $exportStrategy);
+        $result = $this->exportService->exportCustomerData($customerId, $exportStrategy);
 
         return new JsonResponse(json_decode($result));
     }

src/Service/BackResponder/Strategy/BackResponderByEmail.php

@@ -39,7 +39,7 @@ class BackResponderByEmail extends BackResponderContext implements BackResponder
      */
     public function export(string $data): Response
     {
-        $result = $this->exportCustomerDataService->getThirdPartyModulesInformations(['email' => $data]);
+        $result = $this->exportService->getThirdPartyModulesInformations(['email' => $data]);
 
         return new JsonResponse($result);
     }

src/Service/BackResponder/Strategy/BackResponderByPhone.php

@@ -39,7 +39,7 @@ class BackResponderByPhone extends BackResponderContext implements BackResponder
      */
     public function export(string $data): Response
     {
-        $result = $this->exportCustomerDataService->getThirdPartyModulesInformations(['phone' => $data]);
+        $result = $this->exportService->getThirdPartyModulesInformations(['phone' => $data]);
 
         return new JsonResponse($result);
     }