Merge branch 'develop' into cia-2.4.8-beta2-develop-2.4-develop-sync-01132025

pawan-adobe-security · pawan-adobe-security · commit fbadbf660d17 · 2025-01-14T17:47:06.000+05:30
diff --git a/AdobeStockAdminUi/composer.json b/AdobeStockAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-admin-ui",
     "description": "Magento module responsible for the admin panel UI implementation",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-admin-adobe-ims": "*",
         "magento/module-adobe-ims-api": "*",
diff --git a/AdobeStockAsset/composer.json b/AdobeStockAsset/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-asset",
     "description": "Magento module responsible for the Adobe Stock assets handling implementation on Magento side",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-adobe-stock-asset-api": "*",
         "magento/module-adobe-stock-client-api": "*",
diff --git a/AdobeStockAssetApi/composer.json b/AdobeStockAssetApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-asset-api",
     "description": "Magento module responsible for Adobe Stock assets handling on Magento side",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",
diff --git a/AdobeStockClient/Model/Client/Files.php b/AdobeStockClient/Model/Client/Files.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -92,7 +92,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(array $ids, array $columns, string $locale = null): array
+    public function execute(array $ids, array $columns, ?string $locale = null): array
     {
         if (empty($ids)) {
             throw new IntegrationException(__('Files ids can not be empty.'));
diff --git a/AdobeStockClient/Model/ConnectionFactory.php b/AdobeStockClient/Model/ConnectionFactory.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -29,7 +29,7 @@ public function create(
         string $apiKey,
         string $productName,
         string $targetEnvironment,
-        HttpInterface $httpClient = null
+        ?HttpInterface $httpClient = null
     ): AdobeStock {
         return new AdobeStock($apiKey, $productName, $targetEnvironment, $httpClient);
     }
diff --git a/AdobeStockClient/Model/ConnectionWrapper.php b/AdobeStockClient/Model/ConnectionWrapper.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -77,7 +77,7 @@ public function __construct(
         ImsConfig $imsConfig,
         GetAccessTokenInterface $getAccessToken,
         FlushUserTokensInterface $flushUserTokens,
-        HttpInterface $httpClient = null
+        ?HttpInterface $httpClient = null
     ) {
         $this->clientConfig = $clientConfig;
         $this->connectionFactory = $connectionFactory;
@@ -93,7 +93,7 @@ public function __construct(
      * @param string|null $apiKey
      * @return AdobeStock
      */
-    private function getConnection(string $apiKey = null): AdobeStock
+    private function getConnection(?string $apiKey = null): AdobeStock
     {
         if (!$this->connection) {
             $this->connection = $this->connectionFactory->create(
diff --git a/AdobeStockClient/composer.json b/AdobeStockClient/composer.json
@@ -2,11 +2,11 @@
     "name": "magento/module-adobe-stock-client",
     "description": "Magento module responsible for interaction with Adobe Stock API implementation",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-adobe-ims-api": "*",
         "magento/module-adobe-stock-client-api": "*",
-        "astock/stock-api-libphp": "^1.1.2"
+        "astock/stock-api-libphp": "^1.1.6"
     },
     "type": "magento2-module",
     "license": [
@@ -20,11 +20,5 @@
         "psr-4": {
             "Magento\\AdobeStockClient\\": ""
         }
-    },
-    "repositories": {
-        "stock-api-libphp": {
-            "type": "vcs",
-            "url": "git@github.com:adobe/stock-api-libphp.git"
-        }
     }
 }
diff --git a/AdobeStockClientApi/Api/Client/FilesInterface.php b/AdobeStockClientApi/Api/Client/FilesInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -28,5 +28,5 @@ interface FilesInterface
      * @throws IntegrationException
      * @throws Exception
      */
-    public function execute(array $ids, array $columns, string $locale = null): array;
+    public function execute(array $ids, array $columns, ?string $locale = null): array;
 }
diff --git a/AdobeStockClientApi/composer.json b/AdobeStockClientApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-client-api",
     "description": "Magento module responsible for interaction with Adobe Stock API",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",
diff --git a/AdobeStockImage/Model/SaveLicensedImage.php b/AdobeStockImage/Model/SaveLicensedImage.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -61,7 +61,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(int $mediaId, string $destinationPath = null): void
+    public function execute(int $mediaId, ?string $destinationPath = null): void
     {
         $imageUrl = $this->client->getImageDownloadUrl($mediaId);
 
diff --git a/AdobeStockImage/Model/Storage/Save.php b/AdobeStockImage/Model/Storage/Save.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -54,7 +54,7 @@ public function __construct(
         Filesystem $filesystem,
         Https $driver,
         IsPathExcludedInterface $isPathExcluded,
-        int $maxFileLength = null
+        ?int $maxFileLength = null
     ) {
         $this->filesystem = $filesystem;
         $this->driver = $driver;
@@ -75,7 +75,12 @@ public function __construct(
     public function execute(string $imageUrl, string $destinationPath, bool $allowOverwrite = false): void
     {
         if (strlen($destinationPath) > $this->maxFileLength) {
-            throw new LocalizedException(__('Destination Path is too long; must be %1 characters or less', $this->maxFileLength));
+            throw new LocalizedException(
+                __(
+                    'Destination Path is too long; must be %1 characters or less',
+                    $this->maxFileLength
+                )
+            );
         }
 
         $mediaDirectory = $this->filesystem->getDirectoryWrite(DirectoryList::MEDIA);
diff --git a/AdobeStockImage/composer.json b/AdobeStockImage/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-image",
     "description": "Magento module responsible for the images handling implementation",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-adobe-stock-client-api": "*",
         "magento/module-adobe-stock-asset-api": "*",
diff --git a/AdobeStockImageAdminUi/composer.json b/AdobeStockImageAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-image-admin-ui",
     "description": "Magento module responsible for the admin panel images UI implementation",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-adobe-ims": "*",
         "magento/module-adobe-ims-api": "*",
diff --git a/AdobeStockImageApi/Api/SaveLicensedImageInterface.php b/AdobeStockImageApi/Api/SaveLicensedImageInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -27,5 +27,5 @@ interface SaveLicensedImageInterface
      * @throws LocalizedException
      * @throws NotFoundException
      */
-    public function execute(int $mediaId, string $destinationPath = null): void;
+    public function execute(int $mediaId, ?string $destinationPath = null): void;
 }
diff --git a/AdobeStockImageApi/composer.json b/AdobeStockImageApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-adobe-stock-image-api",
     "description": "Magento module responsible for the images handling",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",
