From 7061b92cb6a7cc9495865982fc842a8ae88c2036 Mon Sep 17 00:00:00 2001 From: chuccv Date: Wed, 5 Apr 2023 15:23:11 +0700 Subject: [PATCH 1/3] [Compatible-246] - remove extractBody (Zend_Http) --- Model/Activate.php | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/Model/Activate.php b/Model/Activate.php index e4c3e9a..fa970c9 100644 --- a/Model/Activate.php +++ b/Model/Activate.php @@ -22,11 +22,10 @@ namespace Mageplaza\Core\Model; use Exception; +use Laminas\Http\Request; use Magento\Framework\DataObject; use Magento\Framework\HTTP\Adapter\CurlFactory; use Mageplaza\Core\Helper\AbstractData; -use Zend_Http_Client; -use Zend_Http_Response; /** * Class Activate @@ -36,7 +35,7 @@ class Activate extends DataObject { /** * Localhost maybe not active via https - * @inheritdoc + * */ const MAGEPLAZA_ACTIVE_URL = 'https://dashboard.mageplaza.com/license/index/activate/?isAjax=true'; @@ -71,7 +70,7 @@ public function activate($params = []) $curl = $this->curlFactory->create(); $curl->write( - Zend_Http_Client::POST, + Request::METHOD_POST, self::MAGEPLAZA_ACTIVE_URL, '1.1', [], @@ -83,8 +82,8 @@ public function activate($params = []) if (empty($resultCurl)) { $result['message'] = __('Cannot connect to server. Please try again later.'); } else { - $responseBody = Zend_Http_Response::extractBody($resultCurl); - $result += AbstractData::jsonDecode($responseBody); + $responseBody = $this->extractBody($resultCurl); + $result += AbstractData::jsonDecode($responseBody); if (isset($result['status']) && in_array($result['status'], [200, 201])) { $result['success'] = true; } @@ -97,4 +96,21 @@ public function activate($params = []) return $result; } + + /** + * Extract the body from a response string + * + * @param string $response_str + * + * @return string + */ + public static function extractBody(string $response_str): string + { + $parts = preg_split('|(?:\r\n){2}|m', $response_str, 2); + if (isset($parts[1])) { + return $parts[1]; + } + + return ''; + } } From 96815ee8f9132f77d720d7ede111b73e973b278d Mon Sep 17 00:00:00 2001 From: chuccv Date: Wed, 5 Apr 2023 15:49:31 +0700 Subject: [PATCH 2/3] [Compatible-246] - remove extractBody (Zend_Http) --- Model/Activate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Model/Activate.php b/Model/Activate.php index fa970c9..f95f917 100644 --- a/Model/Activate.php +++ b/Model/Activate.php @@ -104,7 +104,7 @@ public function activate($params = []) * * @return string */ - public static function extractBody(string $response_str): string + public function extractBody(string $response_str): string { $parts = preg_split('|(?:\r\n){2}|m', $response_str, 2); if (isset($parts[1])) { From 69cc2e6267930fe3d009a58e6663bd2391ac79c0 Mon Sep 17 00:00:00 2001 From: Brian Date: Fri, 14 Apr 2023 08:53:34 +0700 Subject: [PATCH 3/3] Compatible with Magento v2.4.6 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 51edf3b..649943d 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "mageplaza/module-core", "description": "Mageplaza Core for Magento 2", "type": "magento2-module", - "version": "1.5.2", + "version": "1.5.3", "license": "proprietary", "authors": [ {