[ACCOUNT-2742] fix: deprecation warnings (#448)

* fix: finer grained scoping * fix: hookable trait & shop provider * fix: log level compat v9 * chore: remove useless confusing tags * chore: cleanup unused code * fix: catch throwable
PrestaShopCorp · Nov 19, 2024 · e9bac9a · e9bac9a
1 parent b7b7271
commit e9bac9a
Show file tree

Hide file tree

Showing 20 changed files with 138 additions and 309 deletions.
diff --git a/.dir-scoped b/.dir-scoped
@@ -5,13 +5,13 @@ symfony/expression-language
 symfony/filesystem
 symfony/yaml
 psr
+monolog
 guzzlehttp
 league
-prestashopcorp
+prestashopcorp/oauth2-prestashop
 lcobucci
 prestashop/module-lib-service-container
 prestashop/module-lib-cache-directory-provider
-monolog
 ramsey/uuid
 ralouphie/getallheaders
 phpseclib/phpseclib/phpseclib
diff --git a/composer.json b/composer.json
@@ -27,30 +27,21 @@
             "PrestaShop\\Module\\PsAccounts\\Vendor\\GuzzleHttp\\Psr7\\": "vendor/guzzlehttp/psr7/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\League\\OAuth2\\Client\\": "vendor/league/oauth2-client/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Lcobucci\\JWT\\": "vendor/lcobucci/jwt/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Monolog\\": "vendor/monolog/monolog/src/Monolog",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\PhpCsFixer\\": "vendor/friendsofphp/php-cs-fixer/src",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\PhpCsFixer\\Tests\\": "vendor/friendsofphp/php-cs-fixer/tests",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\phpseclib\\": "vendor/phpseclib/phpseclib/phpseclib",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Cache\\": "vendor/psr/cache/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Container\\": "vendor/psr/container/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Http\\Message\\": "vendor/psr/http-message/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\Log\\": "vendor/psr/log/Psr/Log",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Psr\\SimpleCache\\": "vendor/psr/simple-cache/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Ramsey\\Uuid\\": "vendor/ramsey/uuid/src",
+
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Cache\\": "vendor/symfony/cache",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Config\\": "vendor/symfony/config",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Console\\": "vendor/symfony/console",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Debug\\": "vendor/symfony/debug",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\DependencyInjection\\": "vendor/symfony/dependency-injection",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\EventDispatcher\\": "vendor/symfony/event-dispatcher",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\ExpressionLanguage\\": "vendor/symfony/expression-language",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Filesystem\\": "vendor/symfony/filesystem",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Finder\\": "vendor/symfony/finder",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\OptionsResolver\\": "vendor/symfony/options-resolver",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Process\\": "vendor/symfony/process",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Stopwatch\\": "vendor/symfony/stopwatch",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\Symfony\\Component\\Yaml\\": "vendor/symfony/yaml",
-            "PrestaShop\\Module\\PsAccounts\\Vendor\\PrestaShop\\ModuleLibServiceContainer\\": "vendor/prestashop/module-lib-service-container/src,",
+
+            "PrestaShop\\Module\\PsAccounts\\Vendor\\PrestaShop\\ModuleLibServiceContainer\\": "vendor/prestashop/module-lib-service-container/src",
             "PrestaShop\\Module\\PsAccounts\\Vendor\\PrestaShop\\ModuleLibCacheDirectoryProvider\\": "vendor/prestashop/module-lib-cache-directory-provider/src"
         },
         "classmap": [

diff --git a/config/command.yml b/config/command.yml
@@ -2,16 +2,12 @@ services:
   PrestaShop\Module\PsAccounts\Account\CommandHandler\LinkShopHandler:
     class: PrestaShop\Module\PsAccounts\Account\CommandHandler\LinkShopHandler
     public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\LinkShopCommand' }
     arguments:
       - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
 
   PrestaShop\Module\PsAccounts\Account\CommandHandler\MigrateAndLinkV4ShopHandler:
     class: PrestaShop\Module\PsAccounts\Account\CommandHandler\MigrateAndLinkV4ShopHandler
     public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\MigrateAndLinkV4ShopCommand' }
     arguments:
       - '@PrestaShop\Module\PsAccounts\Api\Client\AccountsClient'
       - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
@@ -20,8 +16,6 @@ services:
   PrestaShop\Module\PsAccounts\Account\CommandHandler\DeleteUserShopHandler:
     class: PrestaShop\Module\PsAccounts\Account\CommandHandler\DeleteUserShopHandler
     public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\DeleteUserShopCommand' }
     arguments:
       - '@PrestaShop\Module\PsAccounts\Api\Client\AccountsClient'
       - '@PrestaShop\Module\PsAccounts\Context\ShopContext'
@@ -31,8 +25,6 @@ services:
   PrestaShop\Module\PsAccounts\Account\CommandHandler\UnlinkShopHandler:
     class: PrestaShop\Module\PsAccounts\Account\CommandHandler\UnlinkShopHandler
     public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\UnlinkShopCommand' }
     arguments:
       - '@PrestaShop\Module\PsAccounts\Account\LinkShop'
       - '@PrestaShop\Module\PsAccounts\Service\AnalyticsService'
@@ -41,8 +33,6 @@ services:
   PrestaShop\Module\PsAccounts\Account\CommandHandler\UpdateUserShopHandler:
     class: PrestaShop\Module\PsAccounts\Account\CommandHandler\UpdateUserShopHandler
     public: true
-    tags:
-      - { name: tactician.handler, command: 'PrestaShop\Module\PsAccounts\Domain\Shop\Command\UpdateShopCommand' }
     arguments:
       - '@PrestaShop\Module\PsAccounts\Api\Client\AccountsClient'
       - '@PrestaShop\Module\PsAccounts\Context\ShopContext'

diff --git a/config/common.yml b/config/common.yml
@@ -18,8 +18,8 @@ services:
     class: PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger
     public: true
     factory: [ 'PrestaShop\Module\PsAccounts\Log\Logger', 'create' ]
-#    arguments:
-#      - '%ps_accounts.log_level%'
+    arguments:
+      - '%ps_accounts.log_level%'
 
   PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider:
     class: PrestaShop\Module\PsAccounts\Provider\OAuth2\ShopProvider

diff --git a/ps_accounts.php b/ps_accounts.php
@@ -157,7 +157,7 @@ public function __construct()
     }
 
     /**
-     * @return \PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger
+     * @return \Monolog\Logger
      */
     public function getLogger()
     {
@@ -487,22 +487,6 @@ public function getSession()
         throw new \Exception('Feature not available');
     }
 
-    /**
-     * @deprecated
-     *
-     * @return void
-     *
-     * @throws PrestaShopException
-     *
-     * @phpstan-ignore-next-line
-     */
-    private function autoReonboardOnV5()
-    {
-        /** @var \PrestaShop\Module\PsAccounts\Service\PsAccountsService $psAccountsService */
-        $psAccountsService = $this->getService(\PrestaShop\Module\PsAccounts\Service\PsAccountsService::class);
-        $psAccountsService->autoReonboardOnV5();
-    }
-
     /**
      * @return void
      *
@@ -521,9 +505,6 @@ public function onModuleReset()
         // FIXME: this wont prevent from re-implanting override on reset of module
         $uninstaller = new PrestaShop\Module\PsAccounts\Module\Uninstall($this, Db::getInstance());
         $uninstaller->deleteAdminTab('AdminLogin');
-
-//        $this->installEventBus();
-//        $this->autoReonboardOnV5();
     }
 }
 

diff --git a/scoper.inc.php b/scoper.inc.php
@@ -145,13 +145,16 @@ static function ($filePath, $prefix, $contents) {
     'exclude-namespaces' => [
         '~^PrestaShop\\\\OAuth2\\\\Client~',
         '~^Composer\\\\~',
-        '~^Symfony\\Polyfill\\Apcu\\',
-        '~^Symfony\\Polyfill\\Ctype\\',
-        '~^Symfony\\Polyfill\\IntlIdn\\',
-        '~^Symfony\\Polyfill\\IntlNormalizer\\',
-        '~^Symfony\\Polyfill\\Mbstring\\',
-        '~^Symfony\\Polyfill\\Php70\\',
-        '~^Symfony\\Polyfill\\Php72\\',
+        'Monolog\\',
+        //'~^Symfony\\\\Component\\\\Config~',
+        'Symfony\\Component\\Config\\',
+        'Symfony\\Polyfill\\Apcu\\',
+        'Symfony\\Polyfill\\Ctype\\',
+        'Symfony\\Polyfill\\IntlIdn\\',
+        'Symfony\\Polyfill\\IntlNormalizer\\',
+        'Symfony\\Polyfill\\Mbstring\\',
+        'Symfony\\Polyfill\\Php70\\',
+        'Symfony\\Polyfill\\Php72\\',
     ],
     'exclude-classes' => [],
     'exclude-functions' => [

diff --git a/src/Account/Command/MigrateAndLinkV4ShopCommand.php b/src/Account/Command/MigrateAndLinkV4ShopCommand.php
diff --git a/src/Account/CommandHandler/MigrateAndLinkV4ShopHandler.php b/src/Account/CommandHandler/MigrateAndLinkV4ShopHandler.php
diff --git a/src/Account/Session/ShopSession.php b/src/Account/Session/ShopSession.php
@@ -110,7 +110,8 @@ public function refreshToken($refreshToken = null)
                 $e->getMessage()
             ));
         } catch (IdentityProviderException $e) {
-        } catch (\Error $e) {
+        } catch (\Throwable $e) {
+            /* @phpstan-ignore-next-line */
         } catch (\Exception $e) {
         }
         throw new RefreshTokenException('Unable to refresh shop token : ' . $e->getMessage());

diff --git a/src/Api/Client/AccountsClient.php b/src/Api/Client/AccountsClient.php
@@ -152,26 +152,6 @@ public function deleteUserShop($ownerUid, $shopUid, $ownerToken)
         ]);
     }
 
-    /**
-     * @param string $shopUid
-     * @param string $shopToken
-     * @param array $payload
-     *
-     * @return array
-     */
-    public function reonboardShop($shopUid, $shopToken, $payload)
-    {
-        $this->getClient()->setRoute('v1/shop/' . $shopUid . '/reonboard');
-
-        return $this->getClient()->post([
-            'headers' => $this->getHeaders([
-                'Authorization' => 'Bearer ' . $shopToken,
-                'X-Shop-Id' => $shopUid,
-            ]),
-            'json' => $payload,
-        ]);
-    }
-
     /**
      * @param string $ownerUid
      * @param string $shopUid

diff --git a/src/Api/Controller/AbstractRestController.php b/src/Api/Controller/AbstractRestController.php
@@ -90,8 +90,9 @@ public function postProcess()
                 'error' => true,
                 'message' => $e->getMessage(),
             ], $e->getStatusCode());
-        } catch (\Error $e) {
+        } catch (\Throwable $e) {
             $this->handleError($e);
+            /* @phpstan-ignore-next-line */
         } catch (\Exception $e) {
             $this->handleError($e);
         }
@@ -362,7 +363,7 @@ protected function geolocationManagement($defaultCountry)
     }
 
     /**
-     * @param \Error|\Exception $e
+     * @param \Throwable|\Exception $e
      *
      * @return void
      *

diff --git a/src/Context/ShopContext.php b/src/Context/ShopContext.php
@@ -165,7 +165,7 @@ public function getConfiguration()
      *
      * @return mixed
      *
-     * @throws \Exception
+     * @throws \Throwable|\Exception
      */
     public function execInShopContext($shopId, $closure)
     {
@@ -177,7 +177,8 @@ public function execInShopContext($shopId, $closure)
 
         try {
             $result = $closure();
-        } catch (\Error $e) {
+        } catch (\Throwable $e) {
+            /* @phpstan-ignore-next-line */
         } catch (\Exception $e) {
         }
         $this->configuration->setShopId($backup);

diff --git a/src/DependencyInjection/ContainerProvider.php b/src/DependencyInjection/ContainerProvider.php
@@ -21,12 +21,12 @@
 namespace PrestaShop\Module\PsAccounts\DependencyInjection;
 
 use PrestaShop\Module\PsAccounts\Vendor\PrestaShop\ModuleLibCacheDirectoryProvider\Cache\CacheDirectoryProvider;
-use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\Config\ConfigCache;
-use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\Config\FileLocator;
 use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\DependencyInjection\ContainerBuilder;
 use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\DependencyInjection\ContainerInterface;
 use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\DependencyInjection\Dumper\PhpDumper;
 use PrestaShop\Module\PsAccounts\Vendor\Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+use Symfony\Component\Config\ConfigCache;
+use Symfony\Component\Config\FileLocator;
 
 class ContainerProvider
 {

diff --git a/src/Hook/Hook.php b/src/Hook/Hook.php
@@ -20,8 +20,8 @@
 
 namespace PrestaShop\Module\PsAccounts\Hook;
 
+use Monolog\Logger;
 use PrestaShop\Module\PsAccounts\Cqrs\CommandBus;
-use PrestaShop\Module\PsAccounts\Vendor\Monolog\Logger;
 use Ps_accounts;
 
 abstract class Hook