[ACCOUNT-2447] fix: unset values with empty string instead of null (#422

) * fix: unset values with empty string instead of null
PrestaShopCorp · Jul 23, 2024 · 65d534a · 65d534a
1 parent e88dc14
commit 65d534a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/Account/LinkShop.php b/src/Account/LinkShop.php
@@ -47,11 +47,11 @@ public function __construct(
      */
     public function delete()
     {
-        $this->setShopUuid(null);
-        $this->setEmployeeId(null);
-        $this->setOwnerUuid(null);
-        $this->setOwnerEmail(null);
-        $this->setUnlinkedOnError(null);
+        $this->setShopUuid('');
+        $this->setEmployeeId('');
+        $this->setOwnerUuid('');
+        $this->setOwnerEmail('');
+        $this->setUnlinkedOnError('');
     }
 
     /**
@@ -62,10 +62,10 @@ public function delete()
     public function update(Dto\LinkShop $payload)
     {
         $this->setShopUuid($payload->uid);
-        $this->setEmployeeId((int) $payload->employeeId ?: null);
+        $this->setEmployeeId((int) $payload->employeeId ?: '');
         $this->setOwnerUuid($payload->ownerUid);
         $this->setOwnerEmail($payload->ownerEmail);
-        $this->setUnlinkedOnError(null);
+        $this->setUnlinkedOnError('');
     }
 
     /**
@@ -101,7 +101,7 @@ public function getShopUuid()
     }
 
     /**
-     * @param string|null $uuid
+     * @param string $uuid
      *
      * @return void
      */
@@ -111,15 +111,15 @@ public function setShopUuid($uuid)
     }
 
     /**
-     * @return int|null
+     * @return int
      */
     public function getEmployeeId()
     {
         return (int) $this->configuration->getEmployeeId();
     }
 
     /**
-     * @param int|null $employeeId
+     * @param int|string $employeeId
      *
      * @return void
      */
@@ -137,7 +137,7 @@ public function getOwnerUuid()
     }
 
     /**
-     * @param string|null $uuid
+     * @param string $uuid
      *
      * @return void
      */
@@ -147,15 +147,15 @@ public function setOwnerUuid($uuid)
     }
 
     /**
-     * @return string|null
+     * @return string
      */
     public function getOwnerEmail()
     {
         return $this->configuration->getFirebaseEmail();
     }
 
     /**
-     * @param string|null $email
+     * @param string $email
      *
      * @return void
      */
@@ -165,7 +165,7 @@ public function setOwnerEmail($email)
     }
 
     /**
-     * @return string|null
+     * @return string
      */
     public function getUnlinkedOnError()
     {

diff --git a/src/Adapter/Configuration.php b/src/Adapter/Configuration.php
@@ -117,6 +117,7 @@ public function get($key, $default = false, $cached = true)
             return $this->getRaw($key, $this->idLang, $this->idShopGroup, $this->idShop, $default);
         } else {
             // FIXME: idLang ??
+            // FIXME: beware in single shop context idShop must be set
             return $this->getUncached($key, $this->idShopGroup, $this->idShop, $default);
         }
     }