refactor: move providers

PrestaShopCorp · Dec 30, 2024 · 2914b52 · 2914b52
1 parent 3df654f
commit 2914b52
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 17 deletions.
diff --git a/config/common.yml b/config/common.yml
@@ -8,29 +8,29 @@ services:
   PrestaShop\Module\PsAccounts\Service\PsAccountsService:
     class: PrestaShop\Module\PsAccounts\Service\PsAccountsService
     public: true
-    factory: ['PrestaShop\Module\PsAccounts\ServiceContainer\StaticProvider', 'provide']
+    factory: ['PrestaShop\Module\PsAccounts\ServiceProvider\StaticProvider', 'provide']
     arguments:
       - 'PrestaShop\Module\PsAccounts\Service\PsAccountsService'
 
 # FIXME: probably totally useless now
 #  PrestaShop\Module\PsAccounts\Service\PsBillingService:
 #    class: PrestaShop\Module\PsAccounts\Service\PsBillingService
 #    public: true
-#    factory: [ 'PrestaShop\Module\PsAccounts\ServiceContainer\StaticProvider', 'provide' ]
+#    factory: [ 'PrestaShop\Module\PsAccounts\ServiceProvider\StaticProvider', 'provide' ]
 #    arguments:
 #      - 'PrestaShop\Module\PsAccounts\Service\PsBillingService'
 
   PrestaShop\Module\PsAccounts\Repository\UserTokenRepository:
     class: PrestaShop\Module\PsAccounts\Repository\UserTokenRepository
     public: true
-    factory: ['PrestaShop\Module\PsAccounts\ServiceContainer\StaticProvider', 'provide']
+    factory: ['PrestaShop\Module\PsAccounts\ServiceProvider\StaticProvider', 'provide']
     arguments:
       - 'PrestaShop\Module\PsAccounts\Repository\UserTokenRepository'
 
   PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter:
     class: PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter
     public: true
-    factory: ['PrestaShop\Module\PsAccounts\ServiceContainer\StaticProvider', 'provide']
+    factory: ['PrestaShop\Module\PsAccounts\ServiceProvider\StaticProvider', 'provide']
     arguments:
       - 'PrestaShop\Module\PsAccounts\Presenter\PsAccountsPresenter'
 
diff --git a/src/Polyfill/Traits/Controller/AjaxRender.php b/src/Polyfill/Traits/Controller/AjaxRender.php
@@ -32,6 +32,9 @@ trait AjaxRender
      * @return void
      *
      * @throws PrestaShopException
+     *
+     * FIXME: this method might exit OR not
+     * TODO: rename to 'ajaxDie' & exit every time
      */
     protected function ajaxRender($value = null, $controller = null, $method = null)
     {
@@ -41,6 +44,7 @@ protected function ajaxRender($value = null, $controller = null, $method = null)
             if (method_exists($controllerBaseClass, 'ajaxRender')) {
                 /* @phpstan-ignore-next-line */
                 parent::ajaxRender($value, $controller, $method);
+            //exit;
             } else {
                 parent::ajaxDie($value, $controller, $method);
             }

diff --git a/src/ServiceContainer/PsAccountsContainer.php b/src/ServiceContainer/PsAccountsContainer.php
@@ -21,6 +21,7 @@
 namespace PrestaShop\Module\PsAccounts\ServiceContainer;
 
 use PrestaShop\Module\PsAccounts\Log\Logger as LoggerFactory;
+use PrestaShop\Module\PsAccounts\ServiceProvider;
 use PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger;
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\ServiceContainer;
 
@@ -35,12 +36,12 @@ class PsAccountsContainer extends ServiceContainer
      * @var string[]
      */
     protected $provides = [
-        Provider\ApiClientProvider::class,
-        Provider\CommandProvider::class,
-        Provider\DefaultProvider::class,
-        Provider\OAuth2Provider::class,
-        Provider\RepositoryProvider::class,
-        Provider\SessionProvider::class,
+        ServiceProvider\ApiClientProvider::class,
+        ServiceProvider\CommandProvider::class,
+        ServiceProvider\DefaultProvider::class,
+        ServiceProvider\OAuth2Provider::class,
+        ServiceProvider\RepositoryProvider::class,
+        ServiceProvider\SessionProvider::class,
     ];
 
     /**

diff --git a/...eContainer/Provider/ApiClientProvider.php → src/ServiceProvider/ApiClientProvider.php b/...eContainer/Provider/ApiClientProvider.php → src/ServiceProvider/ApiClientProvider.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Api\Client\ServicesBillingClient;

diff --git a/...iceContainer/Provider/CommandProvider.php → src/ServiceProvider/CommandProvider.php b/...iceContainer/Provider/CommandProvider.php → src/ServiceProvider/CommandProvider.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
 use PrestaShop\Module\PsAccounts\Account\CommandHandler\DeleteUserShopHandler;
 use PrestaShop\Module\PsAccounts\Account\CommandHandler\LinkShopHandler;

diff --git a/...iceContainer/Provider/DefaultProvider.php → src/ServiceProvider/DefaultProvider.php b/...iceContainer/Provider/DefaultProvider.php → src/ServiceProvider/DefaultProvider.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Adapter;

diff --git a/...viceContainer/Provider/OAuth2Provider.php → src/ServiceProvider/OAuth2Provider.php b/...viceContainer/Provider/OAuth2Provider.php → src/ServiceProvider/OAuth2Provider.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
 use PrestaShop\Module\PsAccounts\Factory\PrestaShopSessionFactory;
 use PrestaShop\Module\PsAccounts\Middleware\Oauth2Middleware;

diff --git a/...Container/Provider/RepositoryProvider.php → src/ServiceProvider/RepositoryProvider.php b/...Container/Provider/RepositoryProvider.php → src/ServiceProvider/RepositoryProvider.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase\OwnerSession;

diff --git a/...iceContainer/Provider/SessionProvider.php → src/ServiceProvider/SessionProvider.php b/...iceContainer/Provider/SessionProvider.php → src/ServiceProvider/SessionProvider.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer\Provider;
+namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Account\Session\Firebase;

diff --git a/src/ServiceContainer/StaticProvider.php → src/ServiceProvider/StaticProvider.php b/src/ServiceContainer/StaticProvider.php → src/ServiceProvider/StaticProvider.php
@@ -18,7 +18,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PsAccounts\ServiceContainer;
+namespace PrestaShop\Module\PsAccounts\ServiceProvider;
 
 class StaticProvider
 {