refactor: create provider files

PrestaShopCorp · Nov 5, 2024 · 1290d3b · 1290d3b
1 parent a894c77
commit 1290d3b
Show file tree

Hide file tree

Showing 46 changed files with 669 additions and 612 deletions.
diff --git a/config.local.php b/config.local.php
@@ -44,5 +44,5 @@
     'ps_accounts.oauth2_url' => 'https://oauth.prestashop.local',
 
     'ps_accounts.testimonials_url' => 'https://assets.prestashop3.com/dst/accounts/assets/testimonials.json',
-    'ps_accounts.log_level' => 'DEBUG',
+    'ps_accounts.log_level' => 'ERROR',
 ];
diff --git a/src/Account/CommandHandler/DeleteUserShopHandler.php b/src/Account/CommandHandler/DeleteUserShopHandler.php
@@ -26,10 +26,8 @@
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class DeleteUserShopHandler implements IServiceContainerService
+class DeleteUserShopHandler
 {
     /**
      * @var AccountsClient
@@ -89,19 +87,4 @@ public function handle(DeleteUserShopCommand $command)
             );
         });
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(AccountsClient::class),
-            $serviceContainer->get(ShopContext::class),
-            $serviceContainer->get(ShopSession::class),
-            $serviceContainer->get(OwnerSession::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/LinkShopHandler.php b/src/Account/CommandHandler/LinkShopHandler.php
@@ -24,11 +24,9 @@
 use PrestaShop\Module\PsAccounts\Account\Command\LinkShopCommand;
 use PrestaShop\Module\PsAccounts\Account\LinkShop;
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccountLinkAfter;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShopException;
 
-class LinkShopHandler implements IServiceContainerService
+class LinkShopHandler
 {
     /**
      * @var LinkShop
@@ -56,16 +54,4 @@ public function handle(LinkShopCommand $command)
             'shopId' => $command->payload->shopId,
         ]);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(LinkShop::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/MigrateAndLinkV4ShopHandler.php b/src/Account/CommandHandler/MigrateAndLinkV4ShopHandler.php
diff --git a/src/Account/CommandHandler/UnlinkShopHandler.php b/src/Account/CommandHandler/UnlinkShopHandler.php
@@ -26,10 +26,8 @@
 use PrestaShop\Module\PsAccounts\Hook\ActionShopAccountUnlinkAfter;
 use PrestaShop\Module\PsAccounts\Provider\ShopProvider;
 use PrestaShop\Module\PsAccounts\Service\AnalyticsService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class UnlinkShopHandler implements IServiceContainerService
+class UnlinkShopHandler
 {
     /**
      * @var LinkShop
@@ -101,18 +99,4 @@ public function handle(UnlinkShopCommand $command)
 
         Hook::exec(ActionShopAccountUnlinkAfter::getName(), $hookData);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(LinkShop::class),
-            $serviceContainer->get(AnalyticsService::class),
-            $serviceContainer->get(ShopProvider::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/UpdateUserShopHandler.php b/src/Account/CommandHandler/UpdateUserShopHandler.php
@@ -26,10 +26,8 @@
 use PrestaShop\Module\PsAccounts\Api\Client\AccountsClient;
 use PrestaShop\Module\PsAccounts\Context\ShopContext;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class UpdateUserShopHandler implements IServiceContainerService
+class UpdateUserShopHandler
 {
     /**
      * @var AccountsClient
@@ -90,19 +88,4 @@ public function handle(UpdateUserShopCommand $command)
             );
         });
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(AccountsClient::class),
-            $serviceContainer->get(ShopContext::class),
-            $serviceContainer->get(ShopSession::class),
-            $serviceContainer->get(OwnerSession::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/UpgradeModuleHandler.php b/src/Account/CommandHandler/UpgradeModuleHandler.php
@@ -31,10 +31,8 @@
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class UpgradeModuleHandler implements IServiceContainerService
+class UpgradeModuleHandler
 {
     /**
      * @var LinkShop
@@ -166,21 +164,4 @@ private function lastChanceToRefreshShopToken()
             $tokens['refresh_token']
         );
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(AccountsClient::class),
-            $serviceContainer->get(LinkShop::class),
-            $serviceContainer->get(ShopSession::class),
-            $serviceContainer->get(ShopContext::class),
-            $serviceContainer->get(ConfigurationRepository::class),
-            $serviceContainer->get(CommandBus::class)
-        );
-    }
 }
diff --git a/src/Account/CommandHandler/UpgradeModuleMultiHandler.php b/src/Account/CommandHandler/UpgradeModuleMultiHandler.php
@@ -27,11 +27,9 @@
 use PrestaShop\Module\PsAccounts\Exception\DtoException;
 use PrestaShop\Module\PsAccounts\Exception\RefreshTokenException;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShopDatabaseException;
 
-class UpgradeModuleMultiHandler implements IServiceContainerService
+class UpgradeModuleMultiHandler
 {
     /**
      * @var ConfigurationRepository
@@ -95,17 +93,4 @@ private function getShops($multishop)
 
         return $shops;
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(CommandBus::class),
-            $serviceContainer->get(ConfigurationRepository::class)
-        );
-    }
 }
diff --git a/src/Account/LinkShop.php b/src/Account/LinkShop.php
@@ -21,10 +21,8 @@
 namespace PrestaShop\Module\PsAccounts\Account;
 
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class LinkShop implements IServiceContainerService
+class LinkShop
 {
     /**
      * @var ConfigurationRepository
@@ -191,16 +189,4 @@ public function setUnlinkedOnError($errorMsg)
     {
         $this->configuration->updateUnlinkedOnError($errorMsg);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class)
-        );
-    }
 }
diff --git a/src/Account/Session/Firebase/OwnerSession.php b/src/Account/Session/Firebase/OwnerSession.php
@@ -23,10 +23,8 @@
 use PrestaShop\Module\PsAccounts\Account\Session\SessionInterface;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class OwnerSession extends FirebaseSession implements SessionInterface, IServiceContainerService
+class OwnerSession extends FirebaseSession implements SessionInterface
 {
     /**
      * @var ConfigurationRepository
@@ -75,17 +73,4 @@ public function setToken($token, $refreshToken = null)
     {
         $this->configurationRepository->updateUserFirebaseIdAndRefreshToken($token, $refreshToken);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class),
-            $serviceContainer->get(\PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class)
-        );
-    }
 }
diff --git a/src/Account/Session/Firebase/ShopSession.php b/src/Account/Session/Firebase/ShopSession.php
@@ -23,10 +23,8 @@
 use PrestaShop\Module\PsAccounts\Account\Session\SessionInterface;
 use PrestaShop\Module\PsAccounts\Account\Token\Token;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 
-class ShopSession extends FirebaseSession implements SessionInterface, IServiceContainerService
+class ShopSession extends FirebaseSession implements SessionInterface
 {
     /**
      * @var ConfigurationRepository
@@ -75,17 +73,4 @@ public function setToken($token, $refreshToken = null)
     {
         $this->configurationRepository->updateFirebaseIdAndRefreshTokens($token, $refreshToken);
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class),
-            $serviceContainer->get(\PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class)
-        );
-    }
 }
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
@@ -30,14 +30,12 @@
 use PrestaShop\Module\PsAccounts\Log\Logger;
 use PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider;
 use PrestaShop\Module\PsAccounts\Repository\ConfigurationRepository;
-use PrestaShop\Module\PsAccounts\ServiceContainer\IServiceContainerService;
-use PrestaShop\Module\PsAccounts\ServiceContainer\ServiceContainer;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Grant\ClientCredentials;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessToken;
 use PrestaShop\Module\PsAccounts\Vendor\League\OAuth2\Client\Token\AccessTokenInterface;
 
-class ShopSession extends Session implements SessionInterface, IServiceContainerService
+class ShopSession extends Session implements SessionInterface
 {
     /**
      * @var CommandBus
@@ -205,19 +203,4 @@ private function getShopUuid()
     {
         return $this->linkShop->getShopUuid();
     }
-
-    /**
-     * @param ServiceContainer $serviceContainer
-     *
-     * @return self
-     */
-    public static function getInstance(ServiceContainer $serviceContainer)
-    {
-        return new self(
-            $serviceContainer->get(ConfigurationRepository::class),
-            $serviceContainer->get(ShopProvider::class),
-            $serviceContainer->get(LinkShop::class),
-            $serviceContainer->get(CommandBus::class)
-        );
-    }
 }