Removed 2.3 compatibility due to problems with PHP 7.0 and M2.2.6 and…

… the CsrfValidation in M2.3
i-ways · May 23, 2019 · 466d0b0 · 466d0b0
1 parent eaba52d
commit 466d0b0
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 60 deletions.
diff --git a/Controller/Webhooks/Twothree.php b/Controller/Webhooks/Twothree.php
diff --git a/Helper/Data.php b/Helper/Data.php
@@ -126,20 +126,6 @@ public function handleException(\Exception $e)
      */
     public function getWebhooksUrl()
     {
-        $version = $this->productMetaData->getVersion();
-        if (version_compare($version, '2.3.0', '>=')) {
-            return str_replace(
-                'http://',
-                'https://',
-                $this->_getUrl(
-                    'paypalplus/webhooks/twothree/',
-                    [
-                        '_forced_secure' => true,
-                        '_nosid' => true,
-                    ]
-                )
-            );
-        }
         return str_replace(
             'http://',
             'https://',

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
@@ -1,3 +1,6 @@
+==== 1.2.4 ====
+Removed 2.3 compatibility due to problems with PHP 7.0 and M2.2.6 and the CsrfValidation in M2.3
+
 ==== 1.2.3 ====
 Renamed PayPal-Plus to PayPal PLUS
 

diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
   "require": {
     "php": "~7.0.0|~7.1.0|~7.2.0",
     "paypal/rest-api-sdk-php": "^1.6",
-    "magento/module-paypal": "100.0.*|100.1.*|100.2.*|100.3.*"
+    "magento/module-paypal": "100.0.*|100.1.*|100.2.*"
   },
   "authors": [
     {
@@ -19,7 +19,7 @@
     }
   ],
   "type": "magento2-module",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "license": [
     "OSL-3.0"
   ],

diff --git a/marketplace.json b/marketplace.json
@@ -7,7 +7,7 @@
   "require": {
     "php": "~7.0.0|~7.1.0|~7.2.0",
     "paypal/rest-api-sdk-php": "^1.6",
-    "magento/module-paypal": "100.0.*|100.1.*|100.2.*|100.3.*"
+    "magento/module-paypal": "100.0.*|100.1.*|100.2.*"
   },
   "authors": [
     {
@@ -18,7 +18,7 @@
     }
   ],
   "type": "magento2-module",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "license": [
     "OSL-3.0"
   ],