Skip to content

Fixed PHPDoc, coding standard issues and typos #40097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.4-develop
Choose a base branch
from
Open

Fixed PHPDoc, coding standard issues and typos #40097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions app/code/Magento/LoginAsCustomer/Model/GetLoggedAsCustomerAdminId.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);

Expand Down Expand Up @@ -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()
);
}
}
6 changes: 3 additions & 3 deletions app/code/Magento/LoginAsCustomer/Model/SetLoggedAsCustomerAdminId.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);

Expand Down Expand Up @@ -35,6 +35,6 @@ public function __construct(Session $session)
*/
public function execute(int $adminId): void
{
$this->session->setLoggedAsCustomerAdmindId($adminId);
$this->session->setLoggedAsCustomerAdminId($adminId);
}
}
9 changes: 4 additions & 5 deletions lib/internal/Magento/Framework/App/ScopeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand All @@ -10,7 +10,7 @@
class ScopeResolver implements ScopeResolverInterface
{
/**
* @var \Magento\Store\Model\StoreManagerInterface
* @var ObjectManagerInterface
*/
protected $objectManager;

Expand All @@ -30,8 +30,7 @@ public function __construct(ObjectManagerInterface $objectManager)
}

/**
* {@inheritdoc}
* @return ScopeDefault
* @inheritdoc
*/
public function getScope($scopeId = null)
{
Expand Down