Skip to content

Commit 91b6050

Browse files
pawan-adobe-securitypawan-adobe-security
authored
Merge pull request #144 from magento-cia/cia-2.4.8-beta2-develop-2.4-develop-sync-01132025
Cia 2.4.8 beta2 develop 2.4 develop sync 01132025
2 parents 42ac6f8 + fbadbf6 commit 91b6050

File tree

15 files changed

+37
-38
lines changed

15 files changed

+37
-38
lines changed

‎AdobeStockAdminUi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-admin-ui",
33
"description": "Magento module responsible for the admin panel UI implementation",
44
"require": {
5-
"php": "~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-admin-adobe-ims": "*",
88
"magento/module-adobe-ims-api": "*",

‎AdobeStockAsset/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-asset",
33
"description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
44
"require": {
5-
"php": "~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-adobe-stock-asset-api": "*",
88
"magento/module-adobe-stock-client-api": "*",

‎AdobeStockAssetApi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-asset-api",
33
"description": "Magento module responsible for Adobe Stock assets handling on Magento side",
44
"require": {
5-
"php": "~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*"
77
},
88
"type": "magento2-module",

‎AdobeStockClient/Model/Client/Files.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -92,7 +92,7 @@ public function __construct(
9292
/**
9393
* @inheritdoc
9494
*/
95-
public function execute(array $ids, array $columns, string $locale = null): array
95+
public function execute(array $ids, array $columns, ?string $locale = null): array
9696
{
9797
if (empty($ids)) {
9898
throw new IntegrationException(__('Files ids can not be empty.'));

‎AdobeStockClient/Model/ConnectionFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66

77
declare(strict_types=1);
@@ -29,7 +29,7 @@ public function create(
2929
string $apiKey,
3030
string $productName,
3131
string $targetEnvironment,
32-
HttpInterface $httpClient = null
32+
?HttpInterface $httpClient = null
3333
): AdobeStock {
3434
return new AdobeStock($apiKey, $productName, $targetEnvironment, $httpClient);
3535
}

‎AdobeStockClient/Model/ConnectionWrapper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -77,7 +77,7 @@ public function __construct(
7777
ImsConfig $imsConfig,
7878
GetAccessTokenInterface $getAccessToken,
7979
FlushUserTokensInterface $flushUserTokens,
80-
HttpInterface $httpClient = null
80+
?HttpInterface $httpClient = null
8181
) {
8282
$this->clientConfig = $clientConfig;
8383
$this->connectionFactory = $connectionFactory;
@@ -93,7 +93,7 @@ public function __construct(
9393
* @param string|null $apiKey
9494
* @return AdobeStock
9595
*/
96-
private function getConnection(string $apiKey = null): AdobeStock
96+
private function getConnection(?string $apiKey = null): AdobeStock
9797
{
9898
if (!$this->connection) {
9999
$this->connection = $this->connectionFactory->create(

‎AdobeStockClient/composer.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"name": "magento/module-adobe-stock-client",
33
"description": "Magento module responsible for interaction with Adobe Stock API implementation",
44
"require": {
5-
"php": "~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*",
77
"magento/module-adobe-ims-api": "*",
88
"magento/module-adobe-stock-client-api": "*",
9-
"astock/stock-api-libphp": "^1.1.2"
9+
"astock/stock-api-libphp": "^1.1.6"
1010
},
1111
"type": "magento2-module",
1212
"license": [
@@ -20,11 +20,5 @@
2020
"psr-4": {
2121
"Magento\\AdobeStockClient\\": ""
2222
}
23-
},
24-
"repositories": {
25-
"stock-api-libphp": {
26-
"type": "vcs",
27-
"url": "[email protected]:adobe/stock-api-libphp.git"
28-
}
2923
}
3024
}

‎AdobeStockClientApi/Api/Client/FilesInterface.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66

77
declare(strict_types=1);
@@ -28,5 +28,5 @@ interface FilesInterface
2828
* @throws IntegrationException
2929
* @throws Exception
3030
*/
31-
public function execute(array $ids, array $columns, string $locale = null): array;
31+
public function execute(array $ids, array $columns, ?string $locale = null): array;
3232
}

‎AdobeStockClientApi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-adobe-stock-client-api",
33
"description": "Magento module responsible for interaction with Adobe Stock API",
44
"require": {
5-
"php": "~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0||~8.4.0",
66
"magento/framework": "*"
77
},
88
"type": "magento2-module",

‎AdobeStockImage/Model/SaveLicensedImage.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66

77
declare(strict_types=1);
@@ -61,7 +61,7 @@ public function __construct(
6161
/**
6262
* @inheritdoc
6363
*/
64-
public function execute(int $mediaId, string $destinationPath = null): void
64+
public function execute(int $mediaId, ?string $destinationPath = null): void
6565
{
6666
$imageUrl = $this->client->getImageDownloadUrl($mediaId);
6767

0 commit comments

Comments
 (0)