Changed some classes in order to attend to some incompatibilities inc…

…luded in 2.4.6 version (#262)
doofinder · Mar 28, 2023 · f9d9d3c · f9d9d3c
1 parent efa29d0
commit f9d9d3c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/ApiClient/ManagementClient.php b/ApiClient/ManagementClient.php
@@ -47,14 +47,14 @@ public function listSearchEngines(): array
     {
         $response = $this->client->get(self::ENDPOINT_SEARCH_ENGINES);
 
-        return \Zend_Json::decode($response);
+        return json_decode($response, true);
     }
 
     public function createStore(array $storeData): array 
     {
         $response = $this->client->post('/plugins/create-store', $storeData);
 
-        return \Zend_Json::decode($response);
+        return json_decode($response, true);
     }
 
     /**
@@ -77,7 +77,7 @@ public function createSearchEngine(array $searchEngine): array
     {
         $response = $this->client->post(self::ENDPOINT_SEARCH_ENGINES, $searchEngine);
 
-        return \Zend_Json::decode($response);
+        return json_decode($response, true);
     }
 
     /**
@@ -102,7 +102,7 @@ public function processSearchEngine(string $hashId, string $callbackUrl = null):
         $path = $this->getProcessSearchEnginePath($hashId);
         $response = $this->client->post($path, ['callback_url' => $callbackUrl]);
 
-        return \Zend_Json::decode($response);
+        return json_decode($response, true);
     }
 
     /**
@@ -124,7 +124,7 @@ public function getSearchEngine(string $hashid): array
     {
         $url = $this->getSearchEnginePath($hashid);
         $response = $this->client->get($url);
-        return \Zend_Json::decode($response);
+        return json_decode($response, true);
     }
 
     /**
@@ -148,7 +148,7 @@ public function createIndice(array $indice, string $hashId): array
     {
         $response = $this->client->post($this->getIndicesPath($hashId), $indice);
 
-        return \Zend_Json::decode($response);
+        return json_decode($response, true);
     }
 
     /**
@@ -174,7 +174,7 @@ public function createItemsInBulk(array $items, string $hashId, string $indice):
         $path = $this->getItemsBulkPath($hashId, $indice);
         $response = $this->client->post($path, $items);
 
-        return \Zend_Json::decode($response);
+        return json_decode($response, true);
     }
 
     /**
@@ -200,7 +200,7 @@ public function updateItemsInBulk(array $items, string $hashId, string $indice):
         $path = $this->getItemsBulkPath($hashId, $indice);
         $response = $this->client->post($path, $items);
 
-        return \Zend_Json::decode($response);
+        return json_decode($response, true);
     }
 
     /**
@@ -226,7 +226,7 @@ public function deleteItemsInBulk(array $items, string $hashId, string $indice):
         $path = $this->getItemsBulkPath($hashId, $indice);
         $response = $this->client->delete($path, $items);
 
-        return \Zend_Json::decode($response);
+        return json_decode($response, true);
     }
 
     /**

diff --git a/Controller/Adminhtml/Integration/CreateStore.php b/Controller/Adminhtml/Integration/CreateStore.php
@@ -233,7 +233,7 @@ private function setCustomAttributes()
             ];
         }
 
-        $customAttributes = \Zend_Json::encode($attributes);
+        $customAttributes = \Laminas\Json\Json::encode($attributes);
         $this->storeConfig->setCustomAttributes($customAttributes);
     }
 

diff --git a/Cron/Processor.php b/Cron/Processor.php
@@ -107,7 +107,7 @@ private function createProducts($store, $indice)
                 if (count($items)) {
                     try {
                         $this->logger->debug('[CreateInBulk]');
-                        $this->logger->debug(\Zend_Json::encode($items));
+                        $this->logger->debug(\Laminas\Json\Json::encode($items));
                         $this->itemHelper->createItemsInBulk($items, $store, $indice);
                     } catch (\Exception $e) {
                         $this->logger->error(
@@ -136,7 +136,7 @@ private function updateProducts($store, $indice)
                 if (count($items)) {
                     try {
                         $this->logger->debug('[UpdateInBulk]');
-                        $this->logger->debug(\Zend_Json::encode($items));
+                        $this->logger->debug(\Laminas\Json\Json::encode($items));
                         $this->itemHelper->updateItemsInBulk($items, $store, $indice);
                     } catch (\Exception $e) {
                         $this->logger->error(
@@ -164,7 +164,7 @@ private function deleteProducts($store, $indice)
                 if (count($items)) {
                     try {
                         $this->logger->debug('[DeleteInBulk]');
-                        $this->logger->debug(\Zend_Json::encode($items));
+                        $this->logger->debug(\Laminas\Json\Json::encode($items));
                         $this->itemHelper->deleteItemsInBulk($items, $store, $indice);
                     } catch (\Exception $e) {
                         $this->logger->error(

diff --git a/Errors/Utils.php b/Errors/Utils.php
@@ -61,7 +61,7 @@ public static function handleErrors($statusCode, $response)
 
     private static function readError($response): string
     {
-        $error = \Zend_Json::decode($response);
+        $error = json_decode($response, true);
         if ($error === null || !isset($error['error']['message'])) {
             $error = $response;
         } else {

diff --git a/Helper/StoreConfig.php b/Helper/StoreConfig.php
@@ -858,7 +858,7 @@ public function getCustomAttributes(?int $id = null, ?string $scope = ScopeInter
         }
 
         $custom_attributes = $this->scopeConfig->getValue(self::CUSTOM_ATTRIBUTES, $scope, $id);
-        $custom_attributes = ($custom_attributes) ? \Zend_Json::decode($custom_attributes) : null;
+        $custom_attributes = ($custom_attributes) ? json_decode($custom_attributes, true) : null;
         $saved = [];
         if ($custom_attributes && is_array($custom_attributes)) {
             foreach ($custom_attributes as $rowId => $row) {
@@ -900,7 +900,7 @@ public function setCustomAttributes(string $customAttributes) {
     public function getIndexationStatus(int $storeId): array {
         try {
             $status = $this->scopeConfig->getValue(self::INDEXATION_STATUS, ScopeInterface::SCOPE_STORES, $storeId);
-            return \Zend_Json::decode($status);
+            return json_decode($status, true);
         } catch (\Exception $e){
             throw new NotFound('There is not a valid indexation status for the current store.');
         }
@@ -911,7 +911,7 @@ public function getIndexationStatus(int $storeId): array {
      */
     public function setIndexationStatus(array $status, int $storeId){
         $status = $this->indexationHelper->sanitizeProcessTaskStatus($status);
-        $status = \Zend_Json::encode($status);
+        $status = \Laminas\Json\Json::encode($status);
         $this->configWriter->save(self::INDEXATION_STATUS, $status, ScopeInterface::SCOPE_STORES, $storeId);
     }