Merge pull request #124 from klaviyo/202106_m2_fix_230_233

required changes to use SearchResults instead of CartSearchResults
klaviyo · Jun 8, 2021 · b010678 · b010678
2 parents 6c7666a + 4b9d4d0
commit b010678
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### [Unreleased]
 
+### [3.0.4] - 2021-06-08
+
+#### Fixed
+- Use `Magento\Framework\Api\SearchResults` to support Magento 2 versions 2.3.0 to 2.3.3
+
 ### [3.0.3] - 2021-06-01
 
 #### Added
@@ -87,7 +92,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - CSP now uses report-only mode
 
 
-[Unreleased]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.3...HEAD
+[Unreleased]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.4...HEAD
+[3.0.4]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.3...3.0.4
 [3.0.3]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.2...3.0.3
 [3.0.2]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.1...3.0.2
 [3.0.1]: https://github.com/klaviyo/magento2-klaviyo/compare/3.0.0...3.0.1

diff --git a/Plugin/Api/CartSearchRepository.php b/Plugin/Api/CartSearchRepository.php
@@ -7,7 +7,7 @@
 use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartExtensionFactory;
 use Magento\Quote\Model\QuoteIdToMaskedQuoteId;
-use Magento\Quote\Model\CartSearchResults;
+use Magento\Framework\Api\SearchResults;
 
 class CartSearchRepository
 {
@@ -45,11 +45,11 @@ public function __construct(
      * Add "kl_masked_id" extension attribute to order data object to make it accessible in API data
      *
      * @param CartRepositoryInterface $subject
-     * @param CartSearchResults $searchResult
+     * @param SearchResults $searchResult
      *
-     * @return CartSearchResults
+     * @return SearchResults
      */
-    public function afterGetList(CartRepositoryInterface $subject, CartSearchResults $searchResult)
+    public function afterGetList(CartRepositoryInterface $subject, SearchResults $searchResult)
     {
         $quotes = $searchResult->getItems();
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "klaviyo/magento2-extension",
     "description": "Klaviyo extension for Magento 2. Allows pushing newsletters to Klaviyo's platform and more.",
     "type": "magento2-module",
-    "version": "3.0.3",
+    "version": "3.0.4",
     "autoload": {
         "files": [
             "registration.php"
@@ -15,7 +15,7 @@
         "optimize-autoloader": true
     },
     "require": {
-        "magento/module-quote": ">=101.1.0",
+        "magento/module-quote": ">=101.1.0 <=101.1.3",
         "ext-curl": "*"
     }
 }
diff --git a/etc/module.xml b/etc/module.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-  <module name="Klaviyo_Reclaim" setup_version="3.0.3" schema_version="3.0.3">
+  <module name="Klaviyo_Reclaim" setup_version="3.0.4" schema_version="3.0.4">
       <sequence>
           <module name="Magento_Customer"/>
           <module name="Magento_Checkout"/>