Merge pull request #17 from cloudinary/v1.7.4

Pini · web-flow · commit 0efe399d576d · 2019-01-14T12:22:45.000+02:00
v1.7.4
diff --git a/Block/Adminhtml/Product/Edit/NewVideo.php b/Block/Adminhtml/Product/Edit/NewVideo.php
@@ -49,6 +49,7 @@ protected function getCloudinaryConfig()
                 $this->_cloudinaryConfig['api_url'] = "https://api.cloudinary.com/v1_1/{$this->_cloudinaryConfig['cloud_name']}/";
             }
         }
+
         return $this->_cloudinaryConfig;
     }
 
@@ -85,11 +86,13 @@ protected function getNoteVideoUrl()
         } else {
             $result .= __(', YouTube');
         }
+
         if (!$this->getCloudinaryConfig()) {
             $messages .= __('<br>*To add Cloudinary video, please <a href="%1">enter your Cloudinary Account Credentials</a> first.', $this->getCloudinaryConfigUrl());
         } else {
             $result .= __(', Cloudinary');
         }
+
         return $result . $messages;
     }
 
diff --git a/Command/UploadImages.php b/Command/UploadImages.php
@@ -33,7 +33,7 @@ public function __construct(BatchUploader $batchUploader, OutputLogger $outputLo
 
     /**
      * Configure the command
-     * 
+     *
      * @return void
      */
     protected function configure()
diff --git a/Core/CloudinaryImageProvider.php b/Core/CloudinaryImageProvider.php
@@ -84,7 +84,8 @@ public function upload(Image $image)
     public function retrieveTransformed(Image $image, Transformation $transformation)
     {
         $imagePath = \cloudinary_url(
-            $image->getId(), [
+            $image->getId(),
+            [
             'transformation' => $transformation->build(),
             'secure' => true,
             'sign_url' => $this->configuration->getUseSignedUrls()
@@ -141,6 +142,7 @@ public function validateCredentials()
         } catch (\Exception $e) {
             return false;
         }
+
         return true;
     }
 
diff --git a/Core/ConfigurationBuilder.php b/Core/ConfigurationBuilder.php
@@ -25,6 +25,7 @@ public function build()
         if ($this->configuration->getCdnSubdomainStatus()) {
             $config['cdn_subdomain'] = true;
         }
+
         return $config;
     }
 }
diff --git a/Core/Image/Transformation/Dimensions.php b/Core/Image/Transformation/Dimensions.php
@@ -36,6 +36,7 @@ public static function squareMissingDimension(Dimensions $dimensions)
         } elseif (!$dimensions->getHeight()) {
             return Dimensions::square($dimensions->getWidth());
         }
+
         return $dimensions;
     }
 
diff --git a/Core/Migration/BatchUploader.php b/Core/Migration/BatchUploader.php
@@ -88,8 +88,10 @@ public function uploadImages(array $images)
             if ($this->migrationTask->hasBeenStopped()) {
                 break;
             }
+
             $this->uploadImage($image);
         }
+
         $this->logger->notice(sprintf(self::MESSAGE_STATUS, $this->countMigrated, $this->countFailed));
     }
 
@@ -160,6 +162,7 @@ private function addRetryMessage($retryMessage, \Exception $e)
         } else {
             $e = new \Exception($e->getMessage() . $retryMessage);
         }
+
         return $e;
     }
 
diff --git a/Core/ValidateRemoteUrlRequest.php b/Core/ValidateRemoteUrlRequest.php
@@ -19,6 +19,7 @@ public function validate()
         if ($result->responseCode == 200 && is_null($result->error)) {
             return true;
         }
+
         return false;
     }
 
diff --git a/Model/Api/ResourcesManagement.php b/Model/Api/ResourcesManagement.php
@@ -6,6 +6,8 @@
 use Cloudinary\Api;
 use Cloudinary\Cloudinary\Core\ConfigurationBuilder;
 use Cloudinary\Cloudinary\Core\ConfigurationInterface;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\Json\EncoderInterface;
 
 class ResourcesManagement implements \Cloudinary\Cloudinary\Api\ResourcesManagementInterface
 {
@@ -28,26 +30,36 @@ class ResourcesManagement implements \Cloudinary\Cloudinary\Api\ResourcesManagem
     private $_api;
 
     /**
-     * @var \Magento\Framework\App\Request\Http
+     * @var Http
      */
     private $_request;
 
+    /**
+     * @var EncoderInterface
+     */
+    private $_jsonEncoder;
+
     /**
      * ApiClient constructor.
      *
      * @param ConfigurationInterface $configuration
      * @param ConfigurationBuilder   $configurationBuilder
+     * @param Api                    $api
+     * @param Http                   $request
+     * @param EncoderInterface       $jsonEncoder
      */
     public function __construct(
         ConfigurationInterface $configuration,
         ConfigurationBuilder $configurationBuilder,
         Api $api,
-        \Magento\Framework\App\Request\Http $request
+        Http $request,
+        EncoderInterface $jsonEncoder
     ) {
         $this->_configuration = $configuration;
         $this->_configurationBuilder = $configurationBuilder;
         $this->_api = $api;
         $this->_request = $request;
+        $this->_jsonEncoder = $jsonEncoder;
         if ($this->_configuration->isEnabled()) {
             $this->_authorise();
         }
@@ -59,13 +71,6 @@ private function _authorise()
         Cloudinary::$USER_PLATFORM = $this->_configuration->getUserPlatform();
     }
 
-    public function _sendJsonResponse($response)
-    {
-        header('Content-Type: application/json');
-        echo json_encode($response);
-        die;
-    }
-
     /**
      * Get details of a single resource
      *
@@ -76,18 +81,19 @@ protected function _getResourceData()
     {
         try {
             $this->_resourceData = $this->_api->resource(
-                $this->_request->getParam("id"), [
+                $this->_request->getParam("id"),
+                [
                 "resource_type" => $this->_resourceType
                 ]
             );
-            $this->_sendJsonResponse(
+            return $this->_jsonEncoder->encode(
                 [
                 "error" => 0,
                 "data" => $this->_resourceData
                 ]
             );
         } catch (\Exception $e) {
-            $this->_sendJsonResponse(
+            return $this->_jsonEncoder->encode(
                 [
                 "error" => 1,
                 "message" => $e->getMessage()
@@ -102,7 +108,7 @@ protected function _getResourceData()
     public function getImage()
     {
         $this->_resourceType = "image";
-        $this->_getResourceData();
+        return $this->_getResourceData();
     }
 
     /**
@@ -111,6 +117,6 @@ public function getImage()
     public function getVideo()
     {
         $this->_resourceType = "video";
-        $this->_getResourceData();
+        return $this->_getResourceData();
     }
 }
diff --git a/Model/BatchUploader.php b/Model/BatchUploader.php
@@ -85,14 +85,14 @@ public function uploadUnsynchronisedImages(OutputInterface $output = null)
                     $this->displayMessage($output, self::MESSAGE_UPLOAD_INTERRUPTED);
                     return false;
                 }
+
                 $this->uploadAndSynchronise($image, $output);
             }
 
             $this->migrationTask->stop();
             $this->displayMessage($output, sprintf(self::MESSAGE_UPLOAD_COMPLETE, count($images)));
 
             return true;
-
         } catch (\Exception $e) {
             $this->migrationTask->stop();
             throw $e;
diff --git a/Model/Config/Backend/Credentials.php b/Model/Config/Backend/Credentials.php
@@ -105,6 +105,7 @@ public function beforeSave()
             if (!$rawValue) {
                 throw new ValidatorException(__(self::CREDENTIALS_CHECK_MISSING));
             }
+
             if ($this->isSaveAllowed()) {
                 $this->validate($this->getCredentialsFromEnvironmentVariable($rawValue));
             } else {
@@ -143,6 +144,7 @@ private function getCredentialsFromEnvironmentVariable($environmentVariable)
             if (Cloudinary::config_get('private_cdn')) {
                 $credentials["private_cdn"] = Cloudinary::config_get('private_cdn');
             }
+
             return $credentials;
         } catch (\Exception $e) {
             throw new ValidatorException(__(self::CREDENTIALS_CHECK_FAILED));
diff --git a/Model/Config/Backend/Free.php b/Model/Config/Backend/Free.php
@@ -73,13 +73,11 @@ public function __construct(
     public function beforeSave()
     {
         if ($this->hasAccountConfigured() && $this->getValue()) {
-
             $transform = $this->configuration
                 ->getDefaultTransformation()
                 ->withFreeform(Freeform::fromString($this->getValue()));
 
             $this->validate($this->sampleImageUrl($transform));
-
         }
 
         parent::beforeSave();
diff --git a/Model/Config/Source/Dropdown/Dpr.php b/Model/Config/Source/Dropdown/Dpr.php
@@ -8,15 +8,15 @@ class Dpr implements OptionSourceInterface
 {
     public function toOptionArray()
     {
-        return array(
-            array(
+        return [
+            [
                 'value' => '1.0',
                 'label' => '1.0',
-            ),
-            array(
+            ],
+            [
                 'value' => '2.0',
                 'label' => '2.0',
-            ),
-        );
+            ],
+        ];
     }
 }
diff --git a/Model/Configuration.php b/Model/Configuration.php
@@ -261,6 +261,7 @@ public function getEnvironmentVariable()
                 $this->logger->critical($invalidConfigException);
             }
         }
+
         return $this->environmentVariable;
     }
 
diff --git a/Model/Observer/Configuration.php b/Model/Observer/Configuration.php
@@ -73,7 +73,8 @@ public function execute(Observer $observer)
         $this->changedPaths = (array) $observer->getEvent()->getChangedPaths();
         if (count(
             array_intersect(
-                $this->changedPaths, [
+                $this->changedPaths,
+                [
                 \Cloudinary\Cloudinary\Model\Configuration::CONFIG_PATH_ENABLED,
                 \Cloudinary\Cloudinary\Model\Configuration::CONFIG_PATH_ENVIRONMENT_VARIABLE,
                 \Cloudinary\Cloudinary\Model\AutoUploadMapping\AutoUploadConfiguration::REQUEST_PATH
diff --git a/Model/ProductImageFinder.php b/Model/ProductImageFinder.php
@@ -57,7 +57,8 @@ public function findDeletedImages(Product $product)
     private function find(Product $product, ImageFilter $filter)
     {
         return array_map(
-            $this->imageCreator, array_filter(
+            $this->imageCreator,
+            array_filter(
                 $product->getMediaGallery('images') ?: [],
                 $filter
             )
diff --git a/Model/ProductImageFinder/DeletedImageFilter.php b/Model/ProductImageFinder/DeletedImageFilter.php
@@ -12,4 +12,4 @@ public function __invoke($imageData)
     {
         return isset($imageData['removed']) && $imageData['removed'] == 1;
     }
-}
+}
diff --git a/Model/ProductImageFinder/ImageCreator.php b/Model/ProductImageFinder/ImageCreator.php
@@ -53,4 +53,3 @@ public function __invoke(array $imageData)
         );
     }
 }
-
diff --git a/Model/ProductImageFinder/ImageFilter.php b/Model/ProductImageFinder/ImageFilter.php
@@ -14,4 +14,4 @@ interface ImageFilter
      * @return boolean
      */
     public function __invoke($imageData);
-}
+}
diff --git a/Model/ProductImageFinder/NewImageFilter.php b/Model/ProductImageFinder/NewImageFilter.php
@@ -16,4 +16,4 @@ public function __invoke($imageData)
     {
         return !empty($imageData['new_file']);
     }
-}
+}
diff --git a/Model/SynchronisationRepository.php b/Model/SynchronisationRepository.php
@@ -16,8 +16,7 @@
 use Magento\Framework\Api\SearchResultsInterface;
 use Magento\Framework\Api\SearchResultsInterfaceFactory;
 
-class SynchronisationRepository
-    implements SynchronisationRepositoryInterface, SynchroniseAssetsRepositoryInterface
+class SynchronisationRepository implements SynchronisationRepositoryInterface, SynchroniseAssetsRepositoryInterface
 {
     /**
      * @var CollectionFactory
diff --git a/Model/Transformation.php b/Model/Transformation.php
@@ -98,6 +98,7 @@ public function addFreeformTransformationForImage(ImageTransformation $transform
         if (($this->getImageName() === $imageFile) && $this->hasFreeTransformation()) {
             $transformation->withFreeform(Freeform::fromString($this->getFreeTransformation()));
         }
+
         return $transformation;
     }
 
diff --git a/Plugin/Catalog/Block/Product/ImageFactory.php b/Plugin/Catalog/Block/Product/ImageFactory.php
@@ -177,6 +177,7 @@ private function createTransformation(array $imageMiscParams)
         if (isset($imageMiscParams['keep_frame'])) {
             $this->keepFrame = ($imageMiscParams['keep_frame'] === 'frame') ? true : false;
         }
+
         if ($this->keepFrame) {
             $transform->withCrop(Crop::fromString('lpad'))
                 ->withDimensions(Dimensions::squareMissingDimension($dimensions));
diff --git a/Plugin/Catalog/Model/Product/Image/UrlBuilder.php b/Plugin/Catalog/Model/Product/Image/UrlBuilder.php
@@ -174,6 +174,7 @@ private function createTransformation(array $imageMiscParams)
         if (isset($imageMiscParams['keep_frame'])) {
             $this->keepFrame = ($imageMiscParams['keep_frame'] === 'frame') ? true : false;
         }
+
         if ($this->keepFrame) {
             $transform->withCrop(Crop::fromString('lpad'))
                 ->withDimensions(Dimensions::squareMissingDimension($dimensions));
diff --git a/Plugin/ImageHelper.php b/Plugin/ImageHelper.php
@@ -137,6 +137,7 @@ public function aroundGetUrl(CatalogImageHelper $helper, \Closure $originalMetho
         if (!$this->configuration->isEnabled()) {
             return $originalMethod();
         }
+
         $imagePath = $this->imageFile ?: $this->product->getData($helper->getType());
 
         $image = $this->imageFactory->build(sprintf('catalog/product%s', $imagePath), $originalMethod);
diff --git a/Plugin/Widget/Model/Template/Filter.php b/Plugin/Widget/Model/Template/Filter.php
@@ -64,10 +64,12 @@ public function aroundMediaDirective(\Magento\Widget\Model\Template\Filter $widg
         if (!$this->_configuration->isEnabled()) {
             return $proceed($construction);
         }
+
         $params = $this->_cloudinaryWidgetFilter->getParams($construction[2]);
         if (!isset($params['url'])) {
             return $proceed($construction);
         }
+
         $url = (preg_match('/^&quot;.+&quot;$/', $params['url'])) ? preg_replace('/(^&quot;)|(&quot;$)/', '', $params['url']) : $params['url'];
 
         $image = $this->_imageFactory->build(
diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php
@@ -51,6 +51,7 @@ public function upgrade(ModuleDataSetupInterface $setup, ModuleContextInterface
             if ($context->getVersion()) {
                 $this->output->writeln("<comment>Reseting configurations for 'website' & 'store' scopes (only supports 'default' at the moment)</comment>");
             }
+
             $this->resourceConnection->getConnection()->delete(
                 $this->resourceConnection->getTableName('core_config_data'),
                 "path LIKE 'cloudinary/%' AND scope != 'default'"
diff --git a/marketplace.composer.json b/marketplace.composer.json
diff --git a/view/adminhtml/web/js/get-video-information.js b/view/adminhtml/web/js/get-video-information.js

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ protected function getCloudinaryConfig()`
`49`	`49`	`$this->_cloudinaryConfig['api_url'] = "https://api.cloudinary.com/v1_1/{$this->_cloudinaryConfig['cloud_name']}/";`
`50`	`50`	`}`
`51`	`51`	`}`
	`52`	`+`
`52`	`53`	`return $this->_cloudinaryConfig;`
`53`	`54`	`}`
`54`	`55`
`@@ -85,11 +86,13 @@ protected function getNoteVideoUrl()`
`85`	`86`	`} else {`
`86`	`87`	`$result .= __(', YouTube');`
`87`	`88`	`}`
	`89`	`+`
`88`	`90`	`if (!$this->getCloudinaryConfig()) {`
`89`	`91`	`$messages .= __('<br>*To add Cloudinary video, please <a href="%1">enter your Cloudinary Account Credentials</a> first.', $this->getCloudinaryConfigUrl());`
`90`	`92`	`} else {`
`91`	`93`	`$result .= __(', Cloudinary');`
`92`	`94`	`}`
	`95`	`+`
`93`	`96`	`return $result . $messages;`
`94`	`97`	`}`
`95`	`98`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,8 @@ public function upload(Image $image)`
`84`	`84`	`public function retrieveTransformed(Image $image, Transformation $transformation)`
`85`	`85`	`{`
`86`	`86`	`$imagePath = \cloudinary_url(`
`87`		`- $image->getId(), [`
	`87`	`+ $image->getId(),`
	`88`	`+ [`
`88`	`89`	`'transformation' => $transformation->build(),`
`89`	`90`	`'secure' => true,`
`90`	`91`	`'sign_url' => $this->configuration->getUseSignedUrls()`
`@@ -141,6 +142,7 @@ public function validateCredentials()`
`141`	`142`	`} catch (\Exception $e) {`
`142`	`143`	`return false;`
`143`	`144`	`}`
	`145`	`+`
`144`	`146`	`return true;`
`145`	`147`	`}`
`146`	`148`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public function build()`
`25`	`25`	`if ($this->configuration->getCdnSubdomainStatus()) {`
`26`	`26`	`$config['cdn_subdomain'] = true;`
`27`	`27`	`}`
	`28`	`+`
`28`	`29`	`return $config;`
`29`	`30`	`}`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public static function squareMissingDimension(Dimensions $dimensions)`
`36`	`36`	`} elseif (!$dimensions->getHeight()) {`
`37`	`37`	`return Dimensions::square($dimensions->getWidth());`
`38`	`38`	`}`
	`39`	`+`
`39`	`40`	`return $dimensions;`
`40`	`41`	`}`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -88,8 +88,10 @@ public function uploadImages(array $images)`
`88`	`88`	`if ($this->migrationTask->hasBeenStopped()) {`
`89`	`89`	`break;`
`90`	`90`	`}`
	`91`	`+`
`91`	`92`	`$this->uploadImage($image);`
`92`	`93`	`}`
	`94`	`+`
`93`	`95`	`$this->logger->notice(sprintf(self::MESSAGE_STATUS, $this->countMigrated, $this->countFailed));`
`94`	`96`	`}`
`95`	`97`
`@@ -160,6 +162,7 @@ private function addRetryMessage($retryMessage, \Exception $e)`
`160`	`162`	`} else {`
`161`	`163`	`$e = new \Exception($e->getMessage() . $retryMessage);`
`162`	`164`	`}`
	`165`	`+`
`163`	`166`	`return $e;`
`164`	`167`	`}`
`165`	`168`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public function validate()`
`19`	`19`	`if ($result->responseCode == 200 && is_null($result->error)) {`
`20`	`20`	`return true;`
`21`	`21`	`}`
	`22`	`+`
`22`	`23`	`return false;`
`23`	`24`	`}`
`24`	`25`
Original file line number	Diff line number	Diff line change
`@@ -85,14 +85,14 @@ public function uploadUnsynchronisedImages(OutputInterface $output = null)`
`85`	`85`	`$this->displayMessage($output, self::MESSAGE_UPLOAD_INTERRUPTED);`
`86`	`86`	`return false;`
`87`	`87`	`}`
	`88`	`+`
`88`	`89`	`$this->uploadAndSynchronise($image, $output);`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`$this->migrationTask->stop();`
`92`	`93`	`$this->displayMessage($output, sprintf(self::MESSAGE_UPLOAD_COMPLETE, count($images)));`
`93`	`94`
`94`	`95`	`return true;`
`95`		`-`
`96`	`96`	`} catch (\Exception $e) {`
`97`	`97`	`$this->migrationTask->stop();`
`98`	`98`	`throw $e;`
Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,11 @@ public function __construct(`
`73`	`73`	`public function beforeSave()`
`74`	`74`	`{`
`75`	`75`	`if ($this->hasAccountConfigured() && $this->getValue()) {`
`76`		`-`
`77`	`76`	`$transform = $this->configuration`
`78`	`77`	`->getDefaultTransformation()`
`79`	`78`	`->withFreeform(Freeform::fromString($this->getValue()));`
`80`	`79`
`81`	`80`	`$this->validate($this->sampleImageUrl($transform));`
`82`		`-`
`83`	`81`	`}`
`84`	`82`
`85`	`83`	`parent::beforeSave();`
Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,15 @@ class Dpr implements OptionSourceInterface`
`8`	`8`	`{`
`9`	`9`	`public function toOptionArray()`
`10`	`10`	`{`
`11`		`- return array(`
`12`		`- array(`
	`11`	`+ return [`
	`12`	`+ [`
`13`	`13`	`'value' => '1.0',`
`14`	`14`	`'label' => '1.0',`
`15`		`- ),`
`16`		`- array(`
	`15`	`+ ],`
	`16`	`+ [`
`17`	`17`	`'value' => '2.0',`
`18`	`18`	`'label' => '2.0',`
`19`		`- ),`
`20`		`- );`
	`19`	`+ ],`
	`20`	`+ ];`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,7 @@ public function getEnvironmentVariable()`
`261`	`261`	`$this->logger->critical($invalidConfigException);`
`262`	`262`	`}`
`263`	`263`	`}`
	`264`	`+`
`264`	`265`	`return $this->environmentVariable;`
`265`	`266`	`}`
`266`	`267`