Merge upstream/5.x (v5.2.2) into our fork

Brings in:
- fix: recreate deleted config files for upgrade issue (PrestaShopCorp#855)
- fix: undefined key 'route' (PrestaShopCorp#857)
- fix: upgrade purchased modules (PrestaShopCorp#850)
- PHP Null Coalescing Operator fix
- Be sure env var are loaded even if putenv disabled

Keeps our PHP 8.4 compatibility fixes:
- Sentry SDK upgrade to 4.x
- Implicit nullable parameter fixes

Author: PRB69200

bootstrap.php

@@ -20,7 +20,7 @@
 if (!defined('_PS_VERSION_')) {
     exit;
 }
-$rootDir = defined('_PS_ROOT_DIR_') ? _PS_ROOT_DIR_ : getenv('_PS_ROOT_DIR_');
+$rootDir = defined('_PS_ROOT_DIR_') ? _PS_ROOT_DIR_ : (function_exists('putenv') ? getenv('_PS_ROOT_DIR_') : $_ENV['_PS_ROOT_DIR_']);
 if (!$rootDir) {
     $rootDir = __DIR__ . '/../../';
 }
@@ -30,6 +30,4 @@
     require_once $rootAutoload;
 }
 
-(new Symfony\Component\Dotenv\Dotenv())
-    ->usePutenv()
-    ->loadEnv(__DIR__ . '/.env');
+\PrestaShop\Module\Mbo\Helpers\EnvHelper::loadEnv(__DIR__ . '/.env');

config.xml

@@ -2,7 +2,7 @@
 <module>
   <name>ps_mbo</name>
   <displayName><![CDATA[PrestaShop Marketplace in your Back Office]]></displayName>
-  <version><![CDATA[5.2.0]]></version>
+  <version><![CDATA[5.2.2]]></version>
   <description><![CDATA[Browse the Addons marketplace directly from your back office to better meet your needs.]]></description>
   <author><![CDATA[PrestaShop]]></author>
   <tab><![CDATA[administration]]></tab>

config/services/api/modules.yml

@@ -4,6 +4,12 @@ services:
 
   PrestaShop\Module\Mbo\Module\SourceRetriever\AddonsUrlSourceRetriever:
     autowire: true
+    arguments:
+      $addonsDataProvider: '@PrestaShop\Module\Mbo\Addons\Provider\AddonsDataProvider'
+      $translator: '@translator'
+      $httpClient: '@Psr\Http\Client\ClientInterface'
+      $requestFactory: '@Psr\Http\Message\ServerRequestFactoryInterface'
+      $configuration: '@PrestaShop\PrestaShop\Core\ConfigurationInterface'
     properties:
       cacheDir: "%kernel.cache_dir%"
 

config/services/overrides.yml

@@ -31,18 +31,18 @@
 use PrestaShop\Module\Mbo\Accounts\Provider\AccountsDataProvider;
 use PrestaShop\Module\Mbo\Addons\Subscriber\ModuleManagementEventSubscriber;
 use PrestaShop\Module\Mbo\Helpers\Config;
+use PrestaShop\Module\Mbo\Helpers\EnvHelper;
 use PrestaShop\Module\Mbo\Helpers\ErrorHelper;
 use PrestaShop\PrestaShop\Core\Module\ModuleRepository;
 use PrestaShopBundle\Event\ModuleManagementEvent;
-use Symfony\Component\Dotenv\Dotenv;
 
 class ps_mbo extends Module
 {
     use PrestaShop\Module\Mbo\Traits\HaveTabs;
     use PrestaShop\Module\Mbo\Traits\UseHooks;
     use PrestaShop\Module\Mbo\Traits\HaveConfigurationPage;
 
-    public const VERSION = '5.2.0';
+    public const VERSION = '5.2.2';
 
     public array $configurationList = [
         'PS_MBO_SHOP_ADMIN_UUID' => '', // 'ADMIN' because there will be only one for all shops in a multishop context
@@ -71,7 +71,7 @@ public function __construct()
     {
         $this->name = 'ps_mbo';
         // This value must be hard-coded to respect Addons rules, so we must make sure that the const value is always synced with this one
-        $this->version = '5.2.0';
+        $this->version = '5.2.2';
         $this->author = 'PrestaShop';
         $this->tab = 'administration';
         $this->module_key = '6cad5414354fbef755c7df4ef1ab74eb';
@@ -381,16 +381,6 @@ private function uninstallTables(): bool
      */
     private function loadEnv(): void
     {
-        $dotenv = new Dotenv();
-        $dotenv->usePutenv();
-        $dotenv->loadEnv(__DIR__ . '/.env');
-    }
-
-    private function isPsAccountEnabled(): bool
-    {
-        /** @var PrestaShop\PsAccountsInstaller\Installer\Installer|null $accountsInstaller */
-        $accountsInstaller = $this->get(PrestaShop\PsAccountsInstaller\Installer\Installer::class);
-
-        return null !== $accountsInstaller && $accountsInstaller->isModuleEnabled();
+        EnvHelper::loadEnv(__DIR__ . '/.env');
     }
 }

config/services/tab.yml

@@ -242,6 +242,22 @@ public function getAuthenticationParams(): array
         return $authParams;
     }
 
+    /**
+     * Returns authentication parameters for Addons API requests
+     * @return string|null
+     */
+    public function getAuthenticationToken(): ?string
+    {
+        if ($this->isUserAuthenticated()) {
+            $credentials = $this->user->getCredentials();
+            if (null !== $credentials && array_key_exists('accounts_token', $credentials)) {
+                return $credentials['accounts_token'];
+            }
+        }
+
+        return null;
+    }
+
     public function getAccountsShopUuid(): ?string
     {
         if (!$this->isUserAuthenticatedOnAccounts()) {

ps_mbo.php

@@ -22,6 +22,7 @@
 namespace PrestaShop\Module\Mbo\Addons\User;
 
 use PrestaShop\Module\Mbo\Accounts\Provider\AccountsDataProvider;
+use Symfony\Component\HttpFoundation\Exception\SessionNotFoundException;
 use Symfony\Component\HttpFoundation\RequestStack;
 
 if (!defined('_PS_VERSION_')) {
@@ -116,11 +117,15 @@ public function getAccountsShopUuid(): ?string
     }
 
     /**
-     * @return mixed
+     * @return string|null
      */
-    private function getAccountsTokenFromSession()
+    private function getAccountsTokenFromSession(): ?string
     {
-        return $this->requestStack->getSession()->get('accounts_token');
+        try {
+            return $this->requestStack->getSession()->get('accounts_token');
+        } catch (SessionNotFoundException $e) {
+            return null;
+        }
     }
 
     /**

src/Addons/Provider/AddonsDataProvider.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@prestashop.com so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <contact@prestashop.com>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+declare(strict_types=1);
+
+namespace PrestaShop\Module\Mbo\Exception;
+
+use Exception;
+
+class FileOperationException extends Exception
+{
+}

src/Addons/User/AddonsUser.php

@@ -21,6 +21,7 @@
 
 namespace PrestaShop\Module\Mbo\Handler\ErrorHandler;
 
+use PrestaShop\Module\Mbo\Helpers\EnvHelper;
 use Sentry\Client;
 use Sentry\State\Scope;
 use Sentry\UserDataBag;
@@ -48,7 +49,7 @@ class ErrorHandler implements ErrorHandlerInterface
 
     public function __construct()
     {
-        $this->dsn = getenv('SENTRY_CREDENTIALS');
+        $this->dsn = EnvHelper::getEnv('SENTRY_CREDENTIALS');
 
         if (empty($this->dsn)) {
             return;
@@ -58,17 +59,17 @@ public function __construct()
             \Sentry\init([
                 'dsn' => $this->dsn,
                 'release' => \ps_mbo::VERSION,
-                'environment' => getenv('SENTRY_ENVIRONMENT'),
+                'environment' => EnvHelper::getEnv('SENTRY_ENVIRONMENT'),
                 'traces_sample_rate' => 0.5,
                 'sample_rate' => 0.5,
             ]);
 
             \Sentry\configureScope(function (Scope $scope): void {
                 $scope->setContext('shop info', [
                     'prestashop_version' => _PS_VERSION_,
-                    'mbo_cdc_url' => getenv('MBO_CDC_URL'),
-                    'distribution_api_url' => getenv('DISTRIBUTION_API_URL'),
-                    'addons_api_url' => getenv('ADDONS_API_URL'),
+                    'mbo_cdc_url' => EnvHelper::getEnv('MBO_CDC_URL'),
+                    'distribution_api_url' => EnvHelper::getEnv('DISTRIBUTION_API_URL'),
+                    'addons_api_url' => EnvHelper::getEnv('ADDONS_API_URL'),
                 ]);
             });
         } catch (\Throwable $e) {