Fix issues on PS v9

Author: Quetzacoalt91

classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php

@@ -722,7 +722,6 @@ protected function cleanXmlFiles(): void
 
     protected function disableOverrides(): void
     {
-        // @phpstan-ignore function.alreadyNarrowedType (Some PrestaShop may not have this method)
         if (class_exists('PrestaShopAutoload') && method_exists('PrestaShopAutoload', 'generateIndex')) {
             \PrestaShopAutoload::getInstance()->_include_override_path = false;
             \PrestaShopAutoload::getInstance()->generateIndex();

classes/UpgradeTools/Module/ModuleAdapter.php

@@ -38,9 +38,6 @@ class ModuleAdapter
      */
     private $symfonyAdapter;
 
-    /** @var \PrestaShop\PrestaShop\Adapter\Module\ModuleDataUpdater */
-    private $moduleDataUpdater;
-
     /** @var \PrestaShop\PrestaShop\Core\CommandBus\CommandBusInterface */
     private $commandBus;
 
@@ -51,23 +48,6 @@ public function __construct(Translator $translator, string $modulesPath, Symfony
         $this->symfonyAdapter = $symfonyAdapter;
     }
 
-    /**
-     * Available only from 1.7. Can't be called on PS 1.6.
-     *
-     * @return \PrestaShop\PrestaShop\Adapter\Module\ModuleDataUpdater
-     */
-    public function getModuleDataUpdater()
-    {
-        if (null === $this->moduleDataUpdater) {
-            $this->moduleDataUpdater = $this->symfonyAdapter
-                ->initKernel()
-                ->getContainer()
-                ->get('prestashop.core.module.updater');
-        }
-
-        return $this->moduleDataUpdater;
-    }
-
     /**
      * Available only since 1.7.6.0 Can't be called on PS 1.6.
      *

tests/phpstan/forceAutoload.php

@@ -27,3 +27,11 @@ class_exists(Output::class);
 require_once __DIR__ . '/../../vendor/twig/twig/src/Loader/LoaderInterface.php';
 require_once __DIR__ . '/../../vendor/twig/twig/src/Loader/ExistsLoaderInterface.php';
 require_once __DIR__ . '/../../vendor/twig/twig/src/Loader/SourceContextLoaderInterface.php';
+
+if (version_compare(_PS_VERSION_, '9.0.0', '>=')) {
+    // Use the libraries we use instead of the core ones in PHPStan context, when we are sure we don't rely
+    require_once __DIR__ . '/../../vendor/symfony/http-foundation/Request.php';
+    require_once __DIR__ . '/../../vendor/symfony/http-foundation/JsonResponse.php';
+
+    require_once __DIR__ . '/../../vendor/symfony/console/Command/Command.php';
+}

tests/phpstan/phpstan-1.7.2.5.neon

@@ -1,5 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+	- %currentWorkingDirectory%/tests/phpstan/phpstan-partial-pre-v9.neon
 
 parameters:
 	excludePaths:

tests/phpstan/phpstan-1.7.3.4.neon

@@ -1,5 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+	- %currentWorkingDirectory%/tests/phpstan/phpstan-partial-pre-v9.neon
 
 parameters:
 	excludePaths:

tests/phpstan/phpstan-1.7.4.4.neon

@@ -1,5 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+	- %currentWorkingDirectory%/tests/phpstan/phpstan-partial-pre-v9.neon
 
 parameters:
 	excludePaths:

tests/phpstan/phpstan-1.7.5.1.neon

@@ -1,5 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+	- %currentWorkingDirectory%/tests/phpstan/phpstan-partial-pre-v9.neon
 
 parameters:
 	excludePaths:

tests/phpstan/phpstan-1.7.6.neon

@@ -1,5 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+	- %currentWorkingDirectory%/tests/phpstan/phpstan-partial-pre-v9.neon
 
 parameters:
 	excludePaths:

tests/phpstan/phpstan-1.7.7.neon

@@ -1,5 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+	- %currentWorkingDirectory%/tests/phpstan/phpstan-partial-pre-v9.neon
 
 parameters:
 	excludePaths:

tests/phpstan/phpstan-1.7.8.neon

@@ -1,5 +1,6 @@
 includes:
 	- %currentWorkingDirectory%/tests/phpstan/phpstan.neon
+	- %currentWorkingDirectory%/tests/phpstan/phpstan-partial-pre-v9.neon
 
 parameters:
 	excludePaths: