Fix all errors returned by PHPStan

PrestaShopCorp · Nov 12, 2024 · e711dfd · e711dfd
1 parent 9105d45
commit e711dfd
Show file tree

Hide file tree

Showing 41 changed files with 201 additions and 328 deletions.
diff --git a/config/services/api/modules.yml b/config/services/api/modules.yml
@@ -4,8 +4,6 @@ services:
 
   PrestaShop\Module\Mbo\Module\SourceRetriever\AddonsUrlSourceRetriever:
     autowire: true
-    arguments:
-      $modulePath: '%modules_dir%'
     properties:
       cacheDir: "%kernel.cache_dir%"
 

diff --git a/ps_mbo.php b/ps_mbo.php
@@ -136,7 +136,11 @@ public function __construct()
     public function install(): bool
     {
         try {
-            $this->get(PrestaShop\PsAccountsInstaller\Installer\Installer::class)->install();
+            /** @var PrestaShop\PsAccountsInstaller\Installer\Installer|null $installer */
+            $installer = $this->get(PrestaShop\PsAccountsInstaller\Installer\Installer::class);
+            if ($installer) {
+                $installer->install();
+            }
         } catch (Exception $e) {
             ErrorHelper::reportError($e);
         }
@@ -196,7 +200,9 @@ public function uninstall()
         // Execute them first
         foreach ($eventDispatcher->getListeners(ModuleManagementEvent::UNINSTALL) as $listener) {
             if ($listener[0] instanceof ModuleManagementEventSubscriber) {
-                $legacyModule = $this->get(ModuleRepository::class)->getModule('ps_mbo');
+                /** @var ModuleRepository $moduleRepository */
+                $moduleRepository = $this->get(ModuleRepository::class);
+                $legacyModule = $moduleRepository->getModule('ps_mbo');
                 $listener[0]->{(string) $listener[1]}(new ModuleManagementEvent($legacyModule));
             }
         }
@@ -467,6 +473,7 @@ private function loadEnv(): void
 
     private function isPsAccountEnabled(): bool
     {
+        /** @var \PrestaShop\PsAccountsInstaller\Installer\Installer|null $accountsInstaller */
         $accountsInstaller = $this->get(\PrestaShop\PsAccountsInstaller\Installer\Installer::class);
 
         return null !== $accountsInstaller && $accountsInstaller->isModuleEnabled();

diff --git a/src/Accounts/Provider/AccountsDataProvider.php b/src/Accounts/Provider/AccountsDataProvider.php
@@ -23,7 +23,7 @@
 
 use Db;
 use Exception;
-use PrestaShop\Module\PsAccounts\Repository\UserTokenRepository;
+use Module;
 use PrestaShop\PrestaShop\Adapter\ServiceLocator;
 use PrestaShop\PsAccountsInstaller\Installer\Exception\ModuleNotInstalledException;
 use PrestaShop\PsAccountsInstaller\Installer\Exception\ModuleVersionException;
@@ -49,16 +49,22 @@ public function getAccountsToken(): string
             return '';
         }
 
+        if (!class_exists(\PrestaShop\Module\PsAccounts\Repository\UserTokenRepository::class)) {
+            return '';
+        }
+
+        /** @var Module|null $psAccountsModule */
         $psAccountsModule = ServiceLocator::get('ps_accounts');
+        if (null === $psAccountsModule || !method_exists($psAccountsModule, 'getService')) {
+            return '';
+        }
 
-        if (null === $psAccountsModule) {
+        /** @var \PrestaShop\Module\PsAccounts\Repository\UserTokenRepository|null $accountsUserTokenRepository */
+        $accountsUserTokenRepository = $psAccountsModule->getService(\PrestaShop\Module\PsAccounts\Repository\UserTokenRepository::class);
+        if (!$accountsUserTokenRepository) {
             return '';
         }
 
-        /**
-         * @var UserTokenRepository $accountsUserTokenRepository
-         */
-        $accountsUserTokenRepository = $psAccountsModule->getService(UserTokenRepository::class);
         try {
             $token = $accountsUserTokenRepository->getOrRefreshToken();
         } catch (Exception $e) {
@@ -115,8 +121,6 @@ private function isAccountLinked(): bool
     }
 
     /**
-     * @param string $serviceName
-     *
      * @return mixed
      *
      * @throws ModuleNotInstalledException
@@ -126,8 +130,10 @@ public function getAccountsService()
     {
         if ($this->isPsAccountsInstalled()) {
             if ($this->checkPsAccountsVersion()) {
-                return \Module::getInstanceByName(Installer::PS_ACCOUNTS_MODULE_NAME)
-                    ->getService(PsAccounts::PS_ACCOUNTS_SERVICE);
+                $module = \Module::getInstanceByName(Installer::PS_ACCOUNTS_MODULE_NAME);
+                if ($module && method_exists($module, 'getService')) {
+                    return $module->getService(PsAccounts::PS_ACCOUNTS_SERVICE);
+                }
             }
             throw new ModuleVersionException('Module version expected : ' . $this->psAccountsVersion);
         }
@@ -152,6 +158,10 @@ private function isPsAccountsInstalled()
 
     private function checkPsAccountsVersion()
     {
+        if (!class_exists('Ps_accounts')) {
+            return false;
+        }
+
         $moduleName = Installer::PS_ACCOUNTS_MODULE_NAME;
 
         $module = \Module::getInstanceByName($moduleName);

diff --git a/src/Api/Service/ModuleTransitionExecutor.php b/src/Api/Service/ModuleTransitionExecutor.php
@@ -166,7 +166,7 @@ private function generateTokenizedModuleActionUrl($url): string
         $composedUrl .= $baseUrl;
 
         $queryParams = [];
-        if (is_array($components) && isset($components['query']) && is_string($components['query'])) {
+        if (is_array($components) && isset($components['query'])) {
             parse_str($components['query'], $queryParams);
         }
 

diff --git a/src/Controller/Admin/AddonsController.php b/src/Controller/Admin/AddonsController.php
@@ -28,40 +28,16 @@
 use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
 use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
 use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
 class AddonsController extends PrestaShopAdminController
 {
-    /**
-     * @var RequestStack
-     */
-    protected $requestStack;
-
-    /**
-     * @var ModuleManager
-     */
-    private $moduleManager;
-
-    /**
-     * @var ModuleRepository
-     */
-    private $moduleRepository;
-
-    public function __construct(
-        RequestStack $requestStack,
+    public function upgradeModuleAction(
+        Request $request,
         ModuleManager $moduleManager,
-        ModuleRepository $moduleRepository
-    ) {
-        parent::__construct();
-        $this->requestStack = $requestStack;
-        $this->moduleManager = $moduleManager;
-        $this->moduleRepository = $moduleRepository;
-    }
-
-    public function upgradeModuleAction(): JsonResponse
-    {
-        $request = $this->requestStack->getCurrentRequest();
+        ModuleRepository $moduleRepository,
+    ): JsonResponse {
         $moduleName = $request->request->get('moduleName');
 
         if (null === $moduleName) {
@@ -70,30 +46,30 @@ public function upgradeModuleAction(): JsonResponse
 
         try {
             $upgradeResponse = [
-                'status' => $this->moduleManager->upgrade($moduleName),
+                'status' => $moduleManager->upgrade($moduleName),
                 'msg' => '',
                 'module_name' => $moduleName,
             ];
 
             if ($upgradeResponse['status'] === true) {
                 $upgradeResponse['msg'] = $this->trans(
                     'Module %module% successfully upgraded.',
+                    ['%module%' => $moduleName],
                     'Modules.Mbo.Modulescatalog',
-                    ['%module%' => $moduleName]
                 );
-                $upgradeResponse['is_configurable'] = (bool) $this->moduleRepository
+                $upgradeResponse['is_configurable'] = (bool) $moduleRepository
                     ->getModule($moduleName)
                     ->attributes
                     ->get('is_configurable');
             } else {
-                $error = $this->moduleManager->getError($moduleName);
+                $error = $moduleManager->getError($moduleName);
                 $upgradeResponse['msg'] = $this->trans(
                     'Upgrade of module %module% failed. %error%',
-                    'Modules.Mbo.Modulescatalog',
                     [
                         '%module%' => $moduleName,
                         '%error%' => $error,
-                    ]
+                    ],
+                    'Modules.Mbo.Modulescatalog',
                 );
             }
         } catch (Exception $e) {
@@ -102,25 +78,25 @@ public function upgradeModuleAction(): JsonResponse
                 $upgradeResponse['status'] = true;
                 $upgradeResponse['msg'] = $this->trans(
                     'Module %module% is already up to date',
-                    'Modules.Mbo.Modulescatalog',
                     [
                         '%module%' => $moduleName,
-                    ]
+                    ],
+                    'Modules.Mbo.Modulescatalog',
                 );
             } else {
                 try {
-                    $this->moduleManager->disable($moduleName);
+                    $moduleManager->disable($moduleName);
                 } catch (Exception $subE) {
                     ErrorHelper::reportError($subE);
                 }
 
                 $upgradeResponse['msg'] = $this->trans(
                     'Upgrade of module %module% failed. %error%',
-                    'Modules.Mbo.Modulescatalog',
                     [
                         '%module%' => $moduleName,
                         '%error%' => $e->getMessage(),
-                    ]
+                    ],
+                    'Modules.Mbo.Modulescatalog',
                 );
             }
         }

diff --git a/src/Controller/Admin/ModuleCatalogController.php b/src/Controller/Admin/ModuleCatalogController.php
@@ -111,7 +111,7 @@ public function indexAction(): Response
         ];
 
         $cdcJsFile = getenv('MBO_CDC_URL');
-        if (false === $cdcJsFile || !is_string($cdcJsFile) || empty($cdcJsFile)) {
+        if (!is_string($cdcJsFile) || empty($cdcJsFile)) {
             $extraParams['cdc_script_not_found'] = true;
             $extraParams['cdc_error_url'] = $moduleUri . 'views/js/cdc-error.js';
         } else {
@@ -191,14 +191,6 @@ public function cdcErrorAction(): Response
 
     private function ensurePsAccountIsEnabled(): bool
     {
-        if (version_compare(_PS_VERSION_, '9.0.0', '>=')) {
-            return false;
-        }
-
-        if (!$this->psAccountsInstaller) {
-            return false;
-        }
-
         $accountsEnabled = $this->psAccountsInstaller->isModuleEnabled();
         if ($accountsEnabled) {
             return true;
@@ -207,12 +199,8 @@ private function ensurePsAccountIsEnabled(): bool
         return $this->moduleManager->enable($this->psAccountsInstaller->getModuleName());
     }
 
-    private function ensurePsEventbusEnabled()
+    private function ensurePsEventbusEnabled(): void
     {
-        if (version_compare(_PS_VERSION_, '9.0.0', '>=')) {
-            return false;
-        }
-
         if ($this->psEventbusInstaller->install()) {
             $this->psEventbusInstaller->enable();
         }

diff --git a/src/Controller/Admin/ModuleRecommendedController.php b/src/Controller/Admin/ModuleRecommendedController.php
@@ -26,7 +26,7 @@
 use PrestaShopBundle\Controller\Admin\PrestaShopAdminController;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 
@@ -35,42 +35,17 @@
  */
 class ModuleRecommendedController extends PrestaShopAdminController
 {
-    /**
-     * @var RequestStack
-     */
-    protected $requestStack;
-
-    /**
-     * @var TabCollectionProvider
-     */
-    private $tabCollectionProvider;
-
-    /**
-     * @var ContextBuilder
-     */
-    private $contextBuilder;
-
-    /**
-     * @param RequestStack $requestStack
-     */
-    public function __construct(
-        RequestStack $requestStack,
-        TabCollectionProvider $tabCollectionProvider,
-        ContextBuilder $contextBuilder
-    ) {
-        $this->requestStack = $requestStack;
-        $this->tabCollectionProvider = $tabCollectionProvider;
-        $this->contextBuilder = $contextBuilder;
-    }
-
     /**
      * @return JsonResponse|RedirectResponse
      */
-    public function indexAction(): Response
-    {
+    public function indexAction(
+        Request $request,
+        TabCollectionProvider $tabCollectionProvider,
+        ContextBuilder $contextBuilder,
+    ): Response {
         $response = new JsonResponse();
         try {
-            $tabClassName = $this->requestStack->getCurrentRequest()->get('tabClassName');
+            $tabClassName = $request->get('tabClassName');
             if (null === $tabClassName) { // In case the recommended modules page is requested without giving tab context, we redirect to Modules catalog page
                 $routeParams = [];
                 $query = \Tools::getValue('bo_query');
@@ -80,10 +55,10 @@ public function indexAction(): Response
 
                 return $this->redirectToRoute('admin_mbo_catalog_module', $routeParams);
             }
-            $tabCollection = $this->tabCollectionProvider->getTabCollection();
+            $tabCollection = $tabCollectionProvider->getTabCollection();
             $tab = $tabCollection->getTab($tabClassName);
-            $context = $this->contextBuilder->getRecommendedModulesContext($tab);
-            $context['recommendation_format'] = $this->requestStack->getCurrentRequest()->get('recommendation_format');
+            $context = $contextBuilder->getRecommendedModulesContext($tab);
+            $context['recommendation_format'] = $request->get('recommendation_format');
             $response->setData([
                 'content' => $this->renderView(
                     '@Modules/ps_mbo/views/templates/admin/controllers/module_catalog/recommended-modules.html.twig',