From fd157d3d986acd37c3360d2a9326ff8c78deaee8 Mon Sep 17 00:00:00 2001
From: wubinworks <127310257+wubinworks@users.noreply.github.com>
Date: Fri, 25 Jul 2025 01:29:43 +0900
Subject: [PATCH] Fixed PHPDoc, coding standard issues and typos.

---
 .../Model/GetLoggedAsCustomerAdminId.php               | 10 +++++++---
 .../Model/SetLoggedAsCustomerAdminId.php               |  6 +++---
 lib/internal/Magento/Framework/App/ScopeResolver.php   |  9 ++++-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerAdminId.php b/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerAdminId.php
index 17af8a3b5c11f..526cb1449e6fd 100644
--- a/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerAdminId.php
+++ b/app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerAdminId.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -35,6 +35,10 @@ public function __construct(Session $session)
      */
     public function execute(): int
     {
-        return (int)$this->session->getLoggedAsCustomerAdmindId();
+        return (int)(
+            $this->session->getLoggedAsCustomerAdminId()
+                // This typo is kept for backward compatibility. Should be removed on Magento 2.5
+                ?? $this->session->getLoggedAsCustomerAdmindId()
+        );
     }
 }
diff --git a/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerAdminId.php b/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerAdminId.php
index aa16dbcd4f808..9481c7fb337a3 100644
--- a/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerAdminId.php
+++ b/app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerAdminId.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -35,6 +35,6 @@ public function __construct(Session $session)
      */
     public function execute(int $adminId): void
     {
-        $this->session->setLoggedAsCustomerAdmindId($adminId);
+        $this->session->setLoggedAsCustomerAdminId($adminId);
     }
 }
diff --git a/lib/internal/Magento/Framework/App/ScopeResolver.php b/lib/internal/Magento/Framework/App/ScopeResolver.php
index 3772a0590bf33..0408d314e3ffb 100644
--- a/lib/internal/Magento/Framework/App/ScopeResolver.php
+++ b/lib/internal/Magento/Framework/App/ScopeResolver.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\App;
 
@@ -10,7 +10,7 @@
 class ScopeResolver implements ScopeResolverInterface
 {
     /**
-     * @var \Magento\Store\Model\StoreManagerInterface
+     * @var ObjectManagerInterface
      */
     protected $objectManager;
 
@@ -30,8 +30,7 @@ public function __construct(ObjectManagerInterface $objectManager)
     }
 
     /**
-     * {@inheritdoc}
-     * @return ScopeDefault
+     * @inheritdoc
      */
     public function getScope($scopeId = null)
     {