fix: feedback from review

PrestaShop · Feb 25, 2025 · b396980 · b396980
1 parent de64e54
commit b396980
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 20 deletions.
diff --git a/autoupgrade.php b/autoupgrade.php
@@ -25,6 +25,11 @@ class Autoupgrade extends Module
      */
     public $multishop_context;
 
+    /**
+     * @var \PrestaShop\Module\AutoUpgrade\UpgradeContainer
+     */
+    protected $container;
+
     public function __construct()
     {
         $this->name = 'autoupgrade';
@@ -219,17 +224,41 @@ public function trans($id, array $parameters = [], $domain = null, $locale = nul
      * @throws \Twig\Error\SyntaxError
      */
     public function hookDisplayBackOfficeHeader()
+    {
+        if (!$this->initAutoloaderIfCompliant()) {
+            return '';
+        }
+
+        return (new \PrestaShop\Module\AutoUpgrade\Hooks\DisplayBackOfficeHeader($this->getUpgradeContainer()))->renderUpdateNotification();
+    }
+
+    /**
+     * @return bool
+     */
+    public function initAutoloaderIfCompliant()
     {
         require_once _PS_ROOT_DIR_ . '/modules/autoupgrade/classes/VersionUtils.php';
         if (!\PrestaShop\Module\AutoUpgrade\VersionUtils::isActualPHPVersionCompatible()) {
-            return '';
+            return false;
         }
 
         $autoloadPath = __DIR__ . '/vendor/autoload.php';
         if (file_exists($autoloadPath)) {
             require_once $autoloadPath;
         }
 
-        return (new \PrestaShop\Module\AutoUpgrade\Hooks\DisplayBackOfficeHeader())->renderUpdateNotification();
+        return true;
+    }
+
+    /**
+     * @return \PrestaShop\Module\AutoUpgrade\UpgradeContainer
+     */
+    public function getUpgradeContainer()
+    {
+        if (null === $this->container) {
+            $this->container = new \PrestaShop\Module\AutoUpgrade\UpgradeContainer(_PS_ROOT_DIR_, realpath(_PS_ADMIN_DIR_));
+        }
+
+        return $this->container;
     }
 }
diff --git a/classes/Hooks/DisplayBackOfficeHeader.php b/classes/Hooks/DisplayBackOfficeHeader.php
@@ -86,9 +86,9 @@ class DisplayBackOfficeHeader
     /**
      * @throws Exception
      */
-    public function __construct()
+    public function __construct(UpgradeContainer $container)
     {
-        $this->container = new UpgradeContainer(_PS_ROOT_DIR_, realpath(_PS_ADMIN_DIR_));
+        $this->container = $container;
         $this->upgrader = $this->container->getUpgrader();
         $this->updateNotificationService = $this->container->getUpdateNotificationService();
         $this->updateNotificationConfiguration = $this->updateNotificationService->getUpdateNotificationConfiguration();

diff --git a/controllers/admin/AdminAutoupgradeAjaxController.php b/controllers/admin/AdminAutoupgradeAjaxController.php
@@ -20,29 +20,33 @@
 
 use PrestaShop\Module\AutoUpgrade\Hooks\DisplayBackOfficeHeader;
 use PrestaShop\Module\AutoUpgrade\Router\Routes;
-use PrestaShop\Module\AutoUpgrade\Services\UpdateNotificationService;
+use PrestaShop\Module\AutoUpgrade\UpgradeContainer;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 class AdminAutoupgradeAjaxController extends ModuleAdminController
 {
+    /** @var Autoupgrade */
+    public $module;
+
     /** @var bool */
     private $isActualPHPVersionCompatible = true;
 
+    /**
+     * @var UpgradeContainer
+     */
+    private $upgradeContainer;
+
     public function __construct()
     {
         parent::__construct();
-        require_once _PS_ROOT_DIR_ . '/modules/autoupgrade/classes/VersionUtils.php';
 
-        if (!\PrestaShop\Module\AutoUpgrade\VersionUtils::isActualPHPVersionCompatible()) {
+        if (!$this->module->initAutoloaderIfCompliant()) {
             $this->isActualPHPVersionCompatible = false;
 
             return;
         }
 
-        $autoloadPath = __DIR__ . '/../../vendor/autoload.php';
-        if (file_exists($autoloadPath)) {
-            require_once $autoloadPath;
-        }
+        $this->upgradeContainer = $this->module->getUpgradeContainer();
     }
 
     public function postProcess()
@@ -54,7 +58,7 @@ public function postProcess()
         $action = Tools::getValue('action');
         $currentEmployeeId = \Context::getContext()->employee->id;
 
-        $updateNotificationService = new UpdateNotificationService();
+        $updateNotificationService = $this->upgradeContainer->getUpdateNotificationService();
         $updateNotificationConfiguration = $updateNotificationService->getUpdateNotificationConfiguration();
         $updateNotificationConfiguration->addEmployee($currentEmployeeId, time() + DisplayBackOfficeHeader::INTERVAL_CHECK_TIME_IN_SECONDS);
 

diff --git a/controllers/admin/AdminSelfUpgradeController.php b/controllers/admin/AdminSelfUpgradeController.php
@@ -87,19 +87,12 @@ public function __construct()
     {
         $this->bootstrap = true;
         parent::__construct();
-        require_once _PS_ROOT_DIR_ . '/modules/autoupgrade/classes/VersionUtils.php';
-
-        if (!\PrestaShop\Module\AutoUpgrade\VersionUtils::isActualPHPVersionCompatible()) {
+        if (!$this->module->initAutoloaderIfCompliant()) {
             $this->isActualPHPVersionCompatible = false;
 
             return;
         }
 
-        $autoloadPath = __DIR__ . '/../../vendor/autoload.php';
-        if (file_exists($autoloadPath)) {
-            require_once $autoloadPath;
-        }
-
         @set_time_limit(0);
         @ini_set('max_execution_time', '0');
         @ini_set('magic_quotes_runtime', '0');