feat: throw compatible exception when available

PrestaShopCorp · Dec 24, 2024 · b270145 · b270145
1 parent ec73f38
commit b270145
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -51,7 +51,7 @@
         "ramsey/uuid": "^3.9",
         "prestashopcorp/oauth2-prestashop": "^2.0",
         "guzzlehttp/guzzle": "^6.0",
-        "prestashopcorp/lightweight-container": "dev-main"
+        "prestashopcorp/lightweight-container": "v0.1.0"
     },
     "repositories": [
         {
@@ -60,4 +60,4 @@
         }
     ],
     "author": "PrestaShop"
-}
+}
diff --git a/composer.lock b/composer.lock
diff --git a/ps_accounts.php b/ps_accounts.php
@@ -251,7 +251,14 @@ public function getServiceContainer()
      */
     public function getService($serviceName)
     {
-        return $this->getServiceContainer()->getService($serviceName);
+        try {
+            return $this->getServiceContainer()->getService($serviceName);
+        } catch (\PrestaShop\Module\PsAccounts\Vendor\PrestaShopCorp\LightweightContainer\ServiceContainer\Exception\ServiceNotFoundException $e) {
+            if (class_exists('\Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException')) {
+                throw new \Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException($serviceName);
+            }
+            throw $e;
+        }
     }
 
     /**

diff --git a/src/ServiceContainer/PsAccountsContainer.php b/src/ServiceContainer/PsAccountsContainer.php
@@ -50,7 +50,7 @@ public function getLogger()
     {
         if (null === $this->logger) {
             $this->logger = LoggerFactory::create(
-                $this->getParameterWithDefault(
+                $this->getParameter(
                     'ps_accounts.log_level',
                     LoggerFactory::ERROR
                 )