Merge pull request #64 from cloudinary/v1.11.3

v1.11.3

Author: Pniel (Pini) Cohen

Block/Adminhtml/Cms/Wysiwyg/Images/Content.php

@@ -48,10 +48,19 @@ public function getCloudinaryMediaLibraryWidgetOptions($multiple = false, $refre
         if (!($cloudinaryMLoptions = $this->mediaLibraryHelper->getCloudinaryMLOptions($multiple, $refresh))) {
             return null;
         }
+
+        try {
+            //Try to add session param on Magento versions prior to 2.3.5
+            $imageUploadUrl = $this->_urlBuilder->addSessionParam()->getUrl('cloudinary/cms_wysiwyg_images/upload', ['type' => $this->_getMediaType()]);
+        } catch (\Exception $e) {
+            //Catch deprecation error on Magento 2.3.5 and above
+            $imageUploadUrl = $this->_urlBuilder->getUrl('cloudinary/cms_wysiwyg_images/upload', ['type' => $this->_getMediaType()]);
+        }
+
         return $this->_jsonEncoder->encode(
             [
             'cldMLid' => 'wysiwyg_media_gallery',
-            'imageUploaderUrl' => $this->_urlBuilder->addSessionParam()->getUrl('cloudinary/cms_wysiwyg_images/upload', ['type' => $this->_getMediaType()]),
+            'imageUploaderUrl' => $imageUploadUrl,
             'triggerSelector' => '.media-gallery-modal',
             'triggerEvent' => 'fileuploaddone',
             'cloudinaryMLoptions' => $cloudinaryMLoptions,

Block/Adminhtml/Product/Helper/Form/Gallery/Content.php

@@ -64,11 +64,20 @@ public function getCloudinaryMediaLibraryWidgetOptions($multiple = true, $refres
         if (!($cloudinaryMLoptions = $this->mediaLibraryHelper->getCloudinaryMLOptions($multiple, $refresh))) {
             return null;
         }
+
+        try {
+            //Try to add session param on Magento versions prior to 2.3.5
+            $imageUploadUrl = $this->_urlBuilder->addSessionParam()->getUrl('cloudinary/ajax/retrieveImage');
+        } catch (\Exception $e) {
+            //Catch deprecation error on Magento 2.3.5 and above
+            $imageUploadUrl = $this->_urlBuilder->getUrl('cloudinary/ajax/retrieveImage');
+        }
+
         return $this->_jsonEncoder->encode(
             [
             'htmlId' => $this->getHtmlId(),
             'cldMLid' => 'product_gallery_' . $this->getHtmlId(),
-            'imageUploaderUrl' => $this->_urlBuilder->addSessionParam()->getUrl('cloudinary/ajax/retrieveImage'),
+            'imageUploaderUrl' => $imageUploadUrl,
             'triggerSelector' => '#media_gallery_content',
             'triggerEvent' => 'addItem',
             'useDerived' => false,

composer.json

@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary-magento2",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.11.2",
+    "version": "1.11.3",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"

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="Cloudinary_Cloudinary" setup_version="1.11.2">
+  <module name="Cloudinary_Cloudinary" setup_version="1.11.3">
       <sequence>
           <module name="Magento_ProductVideo"/>
       </sequence>

marketplace.composer.json

@@ -2,7 +2,7 @@
     "name": "cloudinary/cloudinary",
     "description": "Cloudinary Magento 2 Integration.",
     "type": "magento2-module",
-    "version": "1.11.2",
+    "version": "1.11.3",
     "license": "MIT",
     "require": {
         "cloudinary/cloudinary_php": "*"