Merge branch 'develop' of https://github.com/mage-os/mirror-inventory …

…into develop
mage-os · Aug 29, 2024 · 0941763 · 0941763
2 parents 5fd3506 + 7dfeb07
commit 0941763
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/InventoryDistanceBasedSourceSelection/Model/DistanceProvider/GoogleMap/GetApiKey.php b/InventoryDistanceBasedSourceSelection/Model/DistanceProvider/GoogleMap/GetApiKey.php
@@ -41,7 +41,7 @@ public function __construct(
      */
     public function execute(): string
     {
-        $apiKey = trim((string) $this->scopeConfig->getValue(self::XML_PATH_API_KEY));
+        $apiKey = trim((string) $this->scopeConfig->getValue(self::XML_PATH_API_KEY) ?? '');
         if (!$apiKey) {
             throw new LocalizedException(__('Google API key is not defined'));
         }

diff --git a/InventoryInStorePickup/Model/SearchRequest/Area/SearchTerm/CountryParser.php b/InventoryInStorePickup/Model/SearchRequest/Area/SearchTerm/CountryParser.php
@@ -61,6 +61,6 @@ private function getCountry(string $searchTerm): ?string
         }
         $searchTerm = explode($this->delimiterConfig->getDelimiter(), $searchTerm);
 
-        return trim(end($searchTerm));
+        return trim(end($searchTerm) ?? '');
     }
 }
diff --git a/InventoryReservations/Model/ReservationBuilder.php b/InventoryReservations/Model/ReservationBuilder.php
@@ -133,6 +133,8 @@ public function build(): ReservationInterface
     }
 
     /**
+     * Validate
+     *
      * @return ValidationResult
      */
     private function validate()
@@ -143,7 +145,7 @@ private function validate()
             $errors[] = __('"%field" is expected to be a number.', ['field' => ReservationInterface::STOCK_ID]);
         }
 
-        if (null === $this->sku || '' === trim($this->sku)) {
+        if (null === $this->sku || '' === trim($this->sku ?? '')) {
             $errors[] = __('"%field" can not be empty.', ['field' => ReservationInterface::SKU]);
         }
 
@@ -156,6 +158,7 @@ private function validate()
 
     /**
      * Used to clean state after object creation
+     *
      * @return void
      */
     private function reset()
@@ -168,7 +171,8 @@ private function reset()
 
     /**
      * Used to convert database field names (that use snake case) into constructor parameter names (that use camel case)
-     * to avoid to define them twice in domain model interface.
+     *
+     * To avoid to define them twice in domain model interface.
      *
      * @param array $array
      * @return array