Skip to content

Commit 42ac6f8

Browse files
pawan-adobe-securitypawan-adobe-security
authored
Merge pull request #142 from magento-cia/cia-2.4.8-beta2-develop-2.4-develop-sync-11232024
Cia 2.4.8 beta2 develop 2.4 develop sync 11232024
2 parents fdf2ee2 + 51d19c9 commit 42ac6f8

File tree

25 files changed

+117
-82
lines changed

25 files changed

+117
-82
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.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-admin-adobe-ims": "*",
88
"magento/module-adobe-ims-api": "*",

‎AdobeStockAsset/Test/Integration/Model/SaveAssetTest.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67

@@ -39,18 +40,18 @@ class SaveAssetTest extends TestCase
3940
/**
4041
* @return array
4142
*/
42-
public function getAssetData(): array
43+
public static function getAssetData(): array
4344
{
4445
return [
4546
'asset_save' => [
46-
'data' => [
47+
'caseData' => [
4748
'media_gallery_path' => ['some/path.jpg'],
4849
'category_id' => 42,
4950
'creator_id' => 42,
5051
]
5152
],
5253
'without_category' => [
53-
'data' => [
54+
'caseData' => [
5455
'media_gallery_path' => ['some/path.jpg'],
5556
'category_id' => null,
5657
'creator_id' => 42,

‎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.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.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.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*"
77
},
88
"type": "magento2-module",

‎AdobeStockClient/Test/Unit/Model/Client/Files/FilesTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);
@@ -276,7 +277,7 @@ public function testWithEmptyIds()
276277
*
277278
* @return array
278279
*/
279-
public function curlRequestHeaders(): array
280+
public static function curlRequestHeaders(): array
280281
{
281282
return
282283
[

‎AdobeStockClient/Test/Unit/Model/ConnectionWrapperTest.php‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);
@@ -289,28 +290,28 @@ public function testFlushTokens(): void
289290
*
290291
* @return array
291292
*/
292-
public function detailedExceptionsForGetNextResponseProvider(): array
293+
public static function detailedExceptionsForGetNextResponseProvider(): array
293294
{
294295
return [
295296
[
296-
'connection_exception_message' => 'Api Key is invalid',
297-
'thrown_exception_message' => 'Adobe API Key is invalid!',
298-
'thrown_exception' => AuthenticationException::class,
297+
'connectionException' => 'Api Key is invalid',
298+
'thrownException' => 'Adobe API Key is invalid!',
299+
'exception' => AuthenticationException::class,
299300
],
300301
[
301-
'connection_exception_message' => 'Api Key is required',
302-
'thrown_exception_message' => 'Adobe Api Key is required!',
303-
'thrown_exception' => AuthenticationException::class,
302+
'connectionException' => 'Api Key is required',
303+
'thrownException' => 'Adobe Api Key is required!',
304+
'exception' => AuthenticationException::class,
304305
],
305306
[
306-
'connection_exception_message' => 'Oauth token is not valid',
307-
'thrown_exception_message' => 'Adobe API login has expired!',
308-
'thrown_exception' => AuthorizationException::class,
307+
'connectionException' => 'Oauth token is not valid',
308+
'thrownException' => 'Adobe API login has expired!',
309+
'exception' => AuthorizationException::class,
309310
],
310311
[
311-
'connection_exception_message' => 'Could not validate the oauth token',
312-
'thrown_exception_message' => 'Adobe API login has expired!',
313-
'thrown_exception' => AuthorizationException::class,
312+
'connectionException' => 'Could not validate the oauth token',
313+
'thrownException' => 'Adobe API login has expired!',
314+
'exception' => AuthorizationException::class,
314315
],
315316
];
316317
}

‎AdobeStockClient/Test/Unit/Model/SearchParametersProvider/PremiumTest.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);
@@ -103,15 +104,15 @@ public function testApply(string $filterName, string $filterValue): void
103104
*
104105
* @return array
105106
*/
106-
public function filterTypesDataProvider(): array
107+
public static function filterTypesDataProvider(): array
107108
{
108109
return [
109110
[
110-
'name' => self::FILTER_TYPE,
111-
'value' => '123'
111+
'filterName' => self::FILTER_TYPE,
112+
'filterValue' => '123'
112113
], [
113-
'name' => 'offensive_filter',
114-
'value' => '456'
114+
'filterName' => 'offensive_filter',
115+
'filterValue' => '456'
115116
]
116117
];
117118
}

‎AdobeStockClient/Test/Unit/Model/SearchParametersProvider/WordsTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67

@@ -199,7 +200,7 @@ public function testApplyWithOnlyQuotes(): void
199200
*
200201
* @return array
201202
*/
202-
public function requestValuesDataProvider(): array
203+
public static function requestValuesDataProvider(): array
203204
{
204205
return [
205206
[

‎AdobeStockClient/Test/Unit/Model/StockFileToDocumentTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
3+
* Copyright 2024 Adobe
4+
* All rights reserved.
45
* See COPYING.txt for license details.
56
*/
67
declare(strict_types=1);
@@ -106,7 +107,7 @@ public function testConvert(StockFile $stockFile, array $attributesData): void
106107
/**
107108
* @return array
108109
*/
109-
public function convertDataProvider(): array
110+
public static function convertDataProvider(): array
110111
{
111112
$stockFile = new StockFile([]);
112113

‎AdobeStockClient/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",
33
"description": "Magento module responsible for interaction with Adobe Stock API implementation",
44
"require": {
5-
"php": "~8.1.0||~8.2.0||~8.3.0",
5+
"php": "~8.2.0||~8.3.0",
66
"magento/framework": "*",
77
"magento/module-adobe-ims-api": "*",
88
"magento/module-adobe-stock-client-api": "*",

0 commit comments

Comments
 (0)