Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit a9b0239

Browse files 
2 parents d2488a5 + d00b6f2 commit a9b0239

File tree

13 files changed

+35
-24
lines changed

13 files changed

+35
-24
lines changed

‎Core/Image/Transformation.php‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ public function __construct()
3131

3232
public function withDefaultImage(DefaultImage $defaultImage)
3333
{
34-
$this->defaultImage = trim((string)$defaultImage);
34+
$defaultImageStr = trim((string)$defaultImage);
35+
if (!empty($defaultImageStr)) {
36+
$this->defaultImage = $defaultImageStr;
37+
}
3538
return $this;
3639
}
3740

@@ -97,12 +100,12 @@ public function build()
97100
'fetch_format' => (string)$this->fetchFormat,
98101
'quality' => (string)$this->quality ?: null,
99102
'crop' => (string)$this->crop,
100-
'gravity' => (string)$this->gravity ?: null,
103+
'gravity' => (string)$this->gravity ?: '',
101104
'width' => $this->dimensions ? $this->dimensions->getWidth() : null,
102105
'height' => $this->dimensions ? $this->dimensions->getHeight() : null,
103106
'dpr' => (string)$this->dpr,
104107
'flags' => $this->flags,
105-
'default_image' => $this->defaultImage,
108+
'default_image' => $this->defaultImage ?? '',
106109
]
107110
];
108111
}

‎Core/UrlGenerator.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function __construct(ConfigurationInterface $configuration, ImageProvider
3434
*
3535
* @return string
3636
*/
37-
public function generateFor(ImageInterface $image, Transformation $transformation = null)
37+
public function generateFor(ImageInterface $image, ?Transformation $transformation = null)
3838
{
3939
if ($image instanceof LocalImage) {
4040
return (string)$image;

‎Model/BatchDownloader.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ private function _authorise()
178178
* @return bool
179179
* @throws \Exception
180180
*/
181-
public function downloadUnsynchronisedImages(OutputInterface $output = null, $override = false)
181+
public function downloadUnsynchronisedImages(?OutputInterface $output = null, $override = false)
182182
{
183183
if (!$this->_configuration->isEnabled(false)) {
184184
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public function __construct(
7070
* @return bool
7171
* @throws \Exception
7272
*/
73-
public function uploadUnsynchronisedImages(OutputInterface $output = null)
73+
public function uploadUnsynchronisedImages(?OutputInterface $output = null)
7474
{
7575
if (!$this->configuration->isEnabled(false)) {
7676
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‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ public function __construct(
7777
TypeListInterface $cacheTypeList,
7878
EncryptorInterface $encryptor,
7979
ConfigurationInterface $configuration,
80-
AbstractResource $resource = null,
81-
AbstractDb $resourceCollection = null,
8280
ConfigurationBuilder $configurationBuilder,
8381
ReinitableConfigInterface $appConfig,
82+
?AbstractResource $resource = null,
83+
?AbstractDb $resourceCollection = null,
8484
array $data = []
8585
) {
8686
$this->configuration = $configuration;

‎Model/Config/Backend/Free.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ public function __construct(
6565
ConfigurationInterface $configuration,
6666
CloudinaryImageProvider $cloudinaryImageProvider,
6767
ProductMetadataInterface $productMetadata,
68-
AbstractResource $resource = null,
69-
AbstractDb $resourceCollection = null,
68+
?AbstractResource $resource = null,
69+
?AbstractDb $resourceCollection = null,
7070
array $data = []
7171
) {
7272
$this->configuration = $configuration;

‎Model/Config/Backend/ProductGalleryCustomFreeParams.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public function __construct(
4141
Registry $registry,
4242
ScopeConfigInterface $config,
4343
TypeListInterface $cacheTypeList,
44-
AbstractResource $resource = null,
45-
AbstractDb $resourceCollection = null,
4644
ManagerInterface $messageManager,
4745
ReinitableConfigInterface $appConfig,
46+
?AbstractResource $resource = null,
47+
?AbstractDb $resourceCollection = null,
4848
array $data = []
4949
) {
5050
$this->messageManager = $messageManager;

‎Model/Config/Backend/SwatchUpload.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
use Magento\Swatches\Model\Swatch;
1313
use Cloudinary\Cloudinary\Model\Configuration;
1414
use Cloudinary\Cloudinary\Core\CloudinaryImageManager;
15-
15+
use Magento\Framework\App\Cache\TypeListInterface;
16+
use Magento\Framework\Model\ResourceModel\AbstractResource;
17+
use Magento\Framework\Data\Collection\AbstractDb;
1618

1719
class SwatchUpload extends Value
1820
{
@@ -55,9 +57,9 @@ public function __construct(
5557
\Magento\Framework\Model\Context $context,
5658
\Magento\Framework\Registry $registry,
5759
ScopeConfigInterface $config,
58-
\Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
59-
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
60-
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
60+
TypeListInterface $cacheTypeList,
61+
?AbstractResource $resource = null,
62+
?AbstractDb $resourceCollection = null,
6163
array $data = []
6264
)
6365
{

‎Model/Config/Backend/VideoSettingsFreeParams.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ public function __construct(
4141
Registry $registry,
4242
ScopeConfigInterface $config,
4343
TypeListInterface $cacheTypeList,
44-
AbstractResource $resource = null,
45-
AbstractDb $resourceCollection = null,
4644
ManagerInterface $messageManager,
4745
ReinitableConfigInterface $appConfig,
46+
?AbstractResource $resource = null,
47+
?AbstractDb $resourceCollection = null,
4848
array $data = []
4949
) {
5050
$this->messageManager = $messageManager;

‎Model/GraphQLResolver/ProductAttributeCldResolver.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public function __construct(
5252
/**
5353
* @inheritdoc
5454
*/
55-
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
55+
public function resolve(Field $field, $context, ResolveInfo $info, ?array $value = null, ?array $args = null)
5656
{
5757
$sku = $value['sku'] ?? null;
5858
if ($sku) {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /