Merge branch 'v2.0.2' of https://github.com/GiritInteractive/magento2-module-cloudinary

Author: RonenGiritCloudinary

Core/Image/Transformation.php

@@ -31,7 +31,10 @@ public function __construct()
 
     public function withDefaultImage(DefaultImage $defaultImage)
     {
-        $this->defaultImage = trim((string)$defaultImage);
+        $defaultImageStr = trim((string)$defaultImage);
+        if (!empty($defaultImageStr)) {
+            $this->defaultImage = $defaultImageStr;
+        }
         return $this;
     }
 
@@ -97,12 +100,12 @@ public function build()
                 'fetch_format' => (string)$this->fetchFormat,
                 'quality' => (string)$this->quality ?: null,
                 'crop' => (string)$this->crop,
-                'gravity' => (string)$this->gravity ?: null,
+                'gravity' => (string)$this->gravity ?: '',
                 'width' => $this->dimensions ? $this->dimensions->getWidth() : null,
                 'height' => $this->dimensions ? $this->dimensions->getHeight() : null,
                 'dpr' => (string)$this->dpr,
                 'flags' => $this->flags,
-                'default_image' => $this->defaultImage,
+                'default_image' => $this->defaultImage ?? '',
             ]
         ];
     }

Core/UrlGenerator.php

@@ -34,7 +34,7 @@ public function __construct(ConfigurationInterface $configuration, ImageProvider
      *
      * @return string
      */
-    public function generateFor(ImageInterface $image, Transformation $transformation = null)
+    public function generateFor(ImageInterface $image, ?Transformation $transformation = null)
     {
         if ($image instanceof LocalImage) {
             return (string)$image;

Model/BatchDownloader.php

@@ -178,7 +178,7 @@ private function _authorise()
      * @return bool
      * @throws \Exception
      */
-    public function downloadUnsynchronisedImages(OutputInterface $output = null, $override = false)
+    public function downloadUnsynchronisedImages(?OutputInterface $output = null, $override = false)
     {
         if (!$this->_configuration->isEnabled(false)) {
             throw new \Exception("Cloudinary seems to be disabled. Please enable it first or pass -f in order to force it on the CLI");

Model/BatchUploader.php

@@ -70,7 +70,7 @@ public function __construct(
      * @return bool
      * @throws \Exception
      */
-    public function uploadUnsynchronisedImages(OutputInterface $output = null)
+    public function uploadUnsynchronisedImages(?OutputInterface $output = null)
     {
         if (!$this->configuration->isEnabled(false)) {
             throw new \Exception("Cloudinary seems to be disabled. Please enable it first or pass -f in order to force it on the CLI");

Model/Config/Backend/Credentials.php

@@ -77,10 +77,10 @@ public function __construct(
         TypeListInterface $cacheTypeList,
         EncryptorInterface $encryptor,
         ConfigurationInterface $configuration,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
         ConfigurationBuilder $configurationBuilder,
         ReinitableConfigInterface $appConfig,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->configuration = $configuration;

Model/Config/Backend/Free.php

@@ -65,8 +65,8 @@ public function __construct(
         ConfigurationInterface $configuration,
         CloudinaryImageProvider $cloudinaryImageProvider,
         ProductMetadataInterface $productMetadata,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->configuration = $configuration;

Model/Config/Backend/ProductGalleryCustomFreeParams.php

@@ -41,10 +41,10 @@ public function __construct(
         Registry $registry,
         ScopeConfigInterface $config,
         TypeListInterface $cacheTypeList,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
         ManagerInterface $messageManager,
         ReinitableConfigInterface $appConfig,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->messageManager = $messageManager;

Model/Config/Backend/SwatchUpload.php

@@ -12,7 +12,9 @@
 use Magento\Swatches\Model\Swatch;
 use Cloudinary\Cloudinary\Model\Configuration;
 use Cloudinary\Cloudinary\Core\CloudinaryImageManager;
-
+use Magento\Framework\App\Cache\TypeListInterface;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+use Magento\Framework\Data\Collection\AbstractDb;
 
 class SwatchUpload extends Value
 {
@@ -55,9 +57,9 @@ public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
         ScopeConfigInterface $config,
-        \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
-        \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
-        \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
+        TypeListInterface $cacheTypeList,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     )
     {

Model/Config/Backend/VideoSettingsFreeParams.php

@@ -41,10 +41,10 @@ public function __construct(
         Registry $registry,
         ScopeConfigInterface $config,
         TypeListInterface $cacheTypeList,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
         ManagerInterface $messageManager,
         ReinitableConfigInterface $appConfig,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->messageManager = $messageManager;

Model/GraphQLResolver/ProductAttributeCldResolver.php

@@ -52,7 +52,7 @@ public function __construct(
         /**
          * @inheritdoc
          */
-        public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+        public function resolve(Field $field, $context, ResolveInfo $info, ?array $value = null, ?array $args = null)
         {
             $sku = $value['sku'] ?? null;
             if ($sku) {