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

dvoskoboinikov · dvoskoboinikov · commit 5f34ef60d764 · 2025-01-14T20:23:53.000-06:00
# Conflicts:
#	AdminAdobeIms/Test/Unit/Command/AdminAdobeImsEnableCommandTest.php
#	AdminAdobeIms/Test/Unit/Plugin/Block/Adminhtml/SignInPluginTest.php
#	AdminAdobeIms/Test/Unit/Service/ImsCommandOptionServiceTest.php
#	AdobeIms/Test/Unit/Block/Adminhtml/SignInTest.php
#	AdobeIms/Test/Unit/Controller/Adminhtml/User/ProfileTest.php
#	AdobeIms/Test/Unit/Model/GetAccessTokenTest.php
#	AdobeIms/Test/Unit/Model/GetImageTest.php
#	AdobeIms/Test/Unit/Model/LoginTest.php
diff --git a/AdminAdobeIms/Console/Command/AdminAdobeImsDisableCommand.php b/AdminAdobeIms/Console/Command/AdminAdobeImsDisableCommand.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/AdminAdobeIms/Console/Command/AdminAdobeImsEnableCommand.php b/AdminAdobeIms/Console/Command/AdminAdobeImsEnableCommand.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/AdminAdobeIms/Console/Command/AdminAdobeImsInfoCommand.php b/AdminAdobeIms/Console/Command/AdminAdobeImsInfoCommand.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/AdminAdobeIms/Console/Command/AdminAdobeImsStatusCommand.php b/AdminAdobeIms/Console/Command/AdminAdobeImsStatusCommand.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/AdminAdobeIms/Model/FlushUserTokens.php b/AdminAdobeIms/Model/FlushUserTokens.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -60,7 +60,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(int $adminUserId = null): void
+    public function execute(?int $adminUserId = null): void
     {
         try {
             $adminUserId = $adminUserId ?? (int) $this->userContext->getUserId();
@@ -82,7 +82,7 @@ public function execute(int $adminUserId = null): void
      * @throws NoSuchEntityException
      * @throws Exception
      */
-    private function revokeTokenForAdobeIms(int $adminUserId = null): void
+    private function revokeTokenForAdobeIms(?int $adminUserId = null): void
     {
         $list = $this->imsWebapiRepository->getByAdminUserId($adminUserId);
         foreach ($list as $entity) {
@@ -102,7 +102,7 @@ private function revokeTokenForAdobeIms(int $adminUserId = null): void
      * @throws NoSuchEntityException
      * @throws LocalizedException
      */
-    private function removeTokensFromTable(int $adminUserId = null): void
+    private function removeTokensFromTable(?int $adminUserId = null): void
     {
         $this->imsWebapiRepository->deleteByAdminUserId($adminUserId);
     }
diff --git a/AdminAdobeIms/Model/GetAccessTokenProxy.php b/AdminAdobeIms/Model/GetAccessTokenProxy.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -49,7 +49,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(int $adminUserId = null): ?string
+    public function execute(?int $adminUserId = null): ?string
     {
         if ($this->adminAdobeImsConfig->enabled()) {
             return $this->getAccessTokenFromSession->execute($adminUserId);
diff --git a/AdminAdobeIms/Model/GetAccessTokenSession.php b/AdminAdobeIms/Model/GetAccessTokenSession.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -30,7 +30,7 @@ public function __construct(Auth $auth)
     /**
      * @inheritdoc
      */
-    public function execute(int $adminUserId = null): ?string
+    public function execute(?int $adminUserId = null): ?string
     {
         return $this->auth->getAuthStorage()->getAdobeAccessToken() ?? null;
     }
diff --git a/AdminAdobeIms/Model/ImsConnection.php b/AdminAdobeIms/Model/ImsConnection.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/AdminAdobeIms/Model/UserAuthorizedProxy.php b/AdminAdobeIms/Model/UserAuthorizedProxy.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -50,7 +50,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(int $adminUserId = null): bool
+    public function execute(?int $adminUserId = null): bool
     {
         if ($this->adminAdobeImsConfig->enabled()) {
             return $this->userAuthorizedSession->execute($adminUserId);
diff --git a/AdminAdobeIms/Model/UserAuthorizedSession.php b/AdminAdobeIms/Model/UserAuthorizedSession.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -41,7 +41,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(int $adminUserId = null): bool
+    public function execute(?int $adminUserId = null): bool
     {
         $token = $this->auth->getAuthStorage()->getAdobeAccessToken();
 
diff --git a/AdminAdobeIms/Test/Mftf/Test/AdminSignInWithAdobeIdTest.xml b/AdminAdobeIms/Test/Mftf/Test/AdminSignInWithAdobeIdTest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2022 Adobe
+  * All Rights Reserved.
   */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/AdminAdobeIms/Test/Unit/Command/AdminAdobeImsEnableCommandTest.php b/AdminAdobeIms/Test/Unit/Command/AdminAdobeImsEnableCommandTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/AdminAdobeIms/Test/Unit/Controller/Adminhtml/OAuth/ImsCallbackTest.php b/AdminAdobeIms/Test/Unit/Controller/Adminhtml/OAuth/ImsCallbackTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/AdminAdobeIms/Test/Unit/Controller/Adminhtml/OAuth/ImsReauthCallbackTest.php b/AdminAdobeIms/Test/Unit/Controller/Adminhtml/OAuth/ImsReauthCallbackTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/AdminAdobeIms/Test/Unit/Model/ImsWebapiRepositoryTest.php b/AdminAdobeIms/Test/Unit/Model/ImsWebapiRepositoryTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/AdminAdobeIms/Test/Unit/Plugin/Block/Adminhtml/SignInPluginTest.php b/AdminAdobeIms/Test/Unit/Plugin/Block/Adminhtml/SignInPluginTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/AdminAdobeIms/Test/Unit/Plugin/ReplaceVerifyIdentityWithImsPluginTest.php b/AdminAdobeIms/Test/Unit/Plugin/ReplaceVerifyIdentityWithImsPluginTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/AdminAdobeIms/Test/Unit/Service/ImsCommandOptionServiceTest.php b/AdminAdobeIms/Test/Unit/Service/ImsCommandOptionServiceTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/AdminAdobeIms/composer.json b/AdminAdobeIms/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "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/AdminAdobeIms/view/adminhtml/email/new_admin_adobe_ims_admin_created.html b/AdminAdobeIms/view/adminhtml/email/new_admin_adobe_ims_admin_created.html
@@ -1,7 +1,7 @@
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 -->
 <!--@subject {{trans "%user_name, you now have access to Adobe Commerce" user_name=$user.firstname}} @-->
diff --git a/AdminAdobeIms/view/adminhtml/templates/admin/sign_in.phtml b/AdminAdobeIms/view/adminhtml/templates/admin/sign_in.phtml
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 /**
diff --git a/AdminAdobeImsTwoFactorAuth/composer.json b/AdminAdobeImsTwoFactorAuth/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-admin-adobe-ims-two-factor-auth",
     "description": "This module is used to add Admin Adobe Ims and Two Factor Auth dependency.",
     "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-two-factor-auth": "*"
diff --git a/AdobeIms/Model/FlushUserTokens.php b/AdobeIms/Model/FlushUserTokens.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -44,7 +44,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(int $adminUserId = null): void
+    public function execute(?int $adminUserId = null): void
     {
         try {
             $adminUserId = $adminUserId ?? (int) $this->userContext->getUserId();
diff --git a/AdobeIms/Model/GetAccessToken.php b/AdobeIms/Model/GetAccessToken.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -51,7 +51,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(int $adminUserId = null): ?string
+    public function execute(?int $adminUserId = null): ?string
     {
         try {
             $adminUserId = $adminUserId ?? (int) $this->userContext->getUserId();
diff --git a/AdobeIms/Model/UserAuthorized.php b/AdobeIms/Model/UserAuthorized.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -44,7 +44,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(int $adminUserId = null): bool
+    public function execute(?int $adminUserId = null): bool
     {
         try {
             $adminUserId = $adminUserId ?? (int) $this->userContext->getUserId();
diff --git a/AdobeIms/Test/Unit/Block/Adminhtml/SignInTest.php b/AdobeIms/Test/Unit/Block/Adminhtml/SignInTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/AdobeIms/Test/Unit/Controller/Adminhtml/User/ProfileTest.php b/AdobeIms/Test/Unit/Controller/Adminhtml/User/ProfileTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
diff --git a/AdobeIms/Test/Unit/Model/GetAccessTokenTest.php b/AdobeIms/Test/Unit/Model/GetAccessTokenTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/AdobeIms/Test/Unit/Model/GetImageTest.php b/AdobeIms/Test/Unit/Model/GetImageTest.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
diff --git a/AdobeIms/Test/Unit/Model/LoginTest.php b/AdobeIms/Test/Unit/Model/LoginTest.php
@@ -1,9 +1,8 @@
 <?php
 declare(strict_types=1);
 /**
- * Copyright 2024 Adobe
- * All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\AdobeIms\Test\Unit\Model;
diff --git a/AdobeIms/composer.json b/AdobeIms/composer.json
diff --git a/AdobeImsApi/Api/FlushUserTokensInterface.php b/AdobeImsApi/Api/FlushUserTokensInterface.php
diff --git a/AdobeImsApi/Api/GetAccessTokenInterface.php b/AdobeImsApi/Api/GetAccessTokenInterface.php
diff --git a/AdobeImsApi/Api/UserAuthorizedInterface.php b/AdobeImsApi/Api/UserAuthorizedInterface.php
diff --git a/AdobeImsApi/composer.json b/AdobeImsApi/composer.json
diff --git a/_metapackage/composer.json b/_metapackage/composer.json
