feat: improve services building

PrestaShopCorp · Feb 8, 2024 · fc7232c · fc7232c
1 parent f27ccd1
commit fc7232c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/tests/Feature/Api/v1/ShopLinkAccount/DeleteTest.php b/tests/Feature/Api/v1/ShopLinkAccount/DeleteTest.php
@@ -26,10 +26,10 @@ public function setUp()
         parent::setUp(); // TODO: Change the autogenerated stub
 
         $this->buildServices([
-            'linkShop' => LinkShop::class,
-            'shopSession' => ShopSession::class,
-            'ownerSession' => OwnerSession::class,
-            'session' => \PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class
+            LinkShop::class,
+            ShopSession::class,
+            OwnerSession::class,
+            ['session' => \PrestaShop\Module\PsAccounts\Account\Session\ShopSession::class],
         ]);
     }
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -148,9 +148,15 @@ public function rollback()
      */
     protected  function buildServices(array $services = [])
     {
-        array_walk($services, function ($class, $property) {
-            echo $class;
-            $this->$property = $this->module->getService($class);
+        //return lcfirst(preg_replace('/^.*\\\\/', '', static::class));
+        array_walk($services, function ($class) {
+            if (is_array($class)) {
+                $propName = array_keys($class)[0];
+                $class = $class[$propName];
+            } else {
+                $propName = lcfirst(preg_replace('/^.*\\\\/', '', $class));
+            }
+            $this->$propName = $this->module->getService($class);
         });
     }