DD#3.0.0-dev: feat: Magento 2.4.5 and greater compatibility

Update guzzlehttp to 7.4 to match Magento 2.4.5

Author: Demoli

.github/workflows/static.yml

@@ -12,7 +12,7 @@ jobs:
         env:
             extensions: bcmath, ctype, curl, dom, gd, hash, iconv, intl, mbstring, openssl, pdo_mysql, simplexml, soap, xsl, zip, libxml
             key: php-cache-v1 # can be any string, change to clear the extension cache.
-            php-version: '7.3'
+            php-version: '8.1'
         steps:
             - uses: actions/checkout@v2
 

.github/workflows/testing.yml

@@ -8,10 +8,10 @@ on:
 
 jobs:
   run_tests:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-version: ['7.2', '7.3']
+        php-version: ['8.1']
     env:
       extensions: bcmath, ctype, curl, dom, gd, hash, iconv, intl, mbstring, openssl, pdo_mysql, simplexml, soap, xsl, zip, libxml
       key: php-cache-v1 # can be any string, change to clear the extension cache.
@@ -46,8 +46,8 @@ jobs:
         with:
           php-version: ${{ matrix.php-version }}
           extensions: ${{ env.extensions }}
-          coverage: xdebug2
-          tools: composer:v1
+          coverage: xdebug3
+          tools: composer:v2
 
       - name: Get Composer Cache Directory
         id: composer-cache
@@ -72,14 +72,14 @@ jobs:
       - name: Download magento
         id: download-magento
         run: |
-          composer create-project --no-install --repository-url=https://repo.magento.com/ magento/project-community-edition=2.3.4 ./magento
+          composer create-project --no-install --repository-url=https://repo.magento.com/ magento/project-community-edition=2.4.5 ./magento
 
       - name: Add module under test
         id: add-module
         run: |
           cd magento
           composer require `jq -r .name ../composer.json` dev-${{ github.head_ref }} --prefer-source --no-update
-          composer require skywire/m2-actions-workflow ^1.0.0 --prefer-source --no-update
+          composer require skywire/m2-actions-workflow ^2.1 --prefer-source --no-update
           cd ../
 
       - name: Install MySQL
@@ -89,9 +89,15 @@ jobs:
           mysql database: 'magento_integration_tests'
           mysql root password: 123123q
 
+      - name: Runs Elasticsearch
+        uses: elastic/elastic-github-actions/elasticsearch@master
+        with:
+          stack-version: 7.17.6
+
       - name: Install Dependencies
         run: |
           cd magento
+          composer config --no-plugins allow-plugins.skywire/file-copy-plugin true
           composer install --no-interaction
           cd ../
 

composer.json

@@ -6,7 +6,7 @@
         "php": "^7.0|^7.1|^7.2|^7.3|^7.4|^8",
         "magento/magento-composer-installer": "*",
         "skywire/testframework":"*",
-        "guzzlehttp/guzzle": "^6.3"
+        "guzzlehttp/guzzle": "^7.4"
     },
     "type": "magento2-module",
     "repositories": {
@@ -22,5 +22,8 @@
         "psr-4": {
             "Skywire\\WordpressApi\\": "src"
         }
+    },
+    "config": {
+        "allow-plugins": true
     }
 }

src/Model/Api/ApiAbstract.php

@@ -8,16 +8,14 @@
 namespace Skywire\WordpressApi\Model\Api;
 
 
+use GuzzleHttp\Psr7\Message;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\DataObject;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Skywire\WordpressApi\Model\Data\Collection;
 use Skywire\WordpressApi\Model\Data\CollectionFactory;
 
-use function GuzzleHttp\Psr7\parse_response;
-use function GuzzleHttp\Psr7\str;
-
 /**
  * @package     Skywire\WordpressApi\Model\Api
  * @author      Skywire Tech Team <tech@skywire.co.uk>
@@ -124,8 +122,11 @@ protected function _createCollection(array $entityData)
         return $collection;
     }
 
-    protected function _populateApiData(array $data = [], $targetObject)
+    protected function _populateApiData(array $data, $targetObject)
     {
+        if(!$data) {
+            return $targetObject;
+        }
         foreach ($data as $key => $value) {
             if (is_array($value)) {
                 $value = $this->_populateApiData($value, new DataObject());
@@ -151,7 +152,8 @@ protected abstract function _getRoute($id = '');
      */
     protected function _parseRoute($id = '')
     {
-        $apiPath = trim($this->scopeConfig->getValue('skywire_wordpress_api/api/path', ScopeInterface::SCOPE_STORE), '/');
+        $apiPath  = $this->scopeConfig->getValue('skywire_wordpress_api/api/path', ScopeInterface::SCOPE_STORE) ?? '';
+        $apiPath = trim($apiPath, '/');
         $route   = str_replace(':id', $id, $this->_getRoute());
         $route   = trim($route, '/');
 
@@ -170,7 +172,7 @@ protected function _request($route, $params = [])
         $cacheKey = $this->_getCacheKey($route, $params, $this->storeManager->getStore()->getCode());
         $cached   = $this->cache->load($cacheKey);
         if ($cached) {
-            return parse_response($cached);
+            return Message::parseResponse($cached);
         }
 
         $client = $this->getRestClient();
@@ -181,7 +183,7 @@ protected function _request($route, $params = [])
             throw new ApiException($e->getMessage(), $e->getCode(), $e);
         }
 
-        $this->cache->save(str($response), $cacheKey, [], $this->scopeConfig->getValue('skywire_wordpress_api/api/cache_ttl'));
+        $this->cache->save(Message::toString($response), $cacheKey, [], $this->scopeConfig->getValue('skywire_wordpress_api/api/cache_ttl'));
 
         return $response;
     }