Skip to content

Fix issue 27162 sort order link incorrect compare #27340

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

Merged
merged 3 commits into from
Jul 23, 2020
Merged

Fix issue 27162 sort order link incorrect compare #27340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f49790
Fix incorrect compare sort order link
Jun 11, 2020
1e22f3d
used escaper in block
Jun 23, 2020
0fadeff
Merge branch '2.4-develop' into fix-issue-27162-sort-order-link-incor…
ihor-sviziev Jun 24, 2020
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
8 changes: 4 additions & 4 deletions app/code/Magento/Customer/Block/Account/Navigation.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

namespace Magento\Customer\Block\Account;

use \Magento\Framework\View\Element\Html\Links;
use \Magento\Customer\Block\Account\SortLinkInterface;
use Magento\Framework\View\Element\Html\Links;
use Magento\Customer\Block\Account\SortLinkInterface;

/**
* Class for sorting links in navigation panels.
Expand All @@ -19,7 +19,7 @@
class Navigation extends Links
{
/**
* {@inheritdoc}
* @inheritdoc
* @since 100.2.0
*/
public function getLinks()
Expand Down Expand Up @@ -47,6 +47,6 @@ public function getLinks()
*/
private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink): int
{
return $secondLink->getSortOrder() <=> $firstLink->getSortOrder();
return $firstLink->getSortOrder() <=> $secondLink->getSortOrder();
}
}
25 changes: 15 additions & 10 deletions app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@

class NavigationTest extends TestCase
{
/**
* Stub name top links
*/
private const STUB_TOP_LINKS_NAME_IN_LAYOUT = 'top.links';

/**
* @var ObjectManagerHelper
*/
Expand Down Expand Up @@ -62,7 +67,7 @@ protected function setUp(): void
*
* @return void
*/
public function testGetLinksWithCustomerAndWishList()
public function testGetLinksWithCustomerAndWishList(): void
{
$wishListLinkMock = $this->getMockBuilder(WishListLink::class)
->disableOriginalConstructor()
Expand All @@ -76,30 +81,30 @@ public function testGetLinksWithCustomerAndWishList()

$wishListLinkMock->expects($this->any())
->method('getSortOrder')
->willReturn(100);
->willReturn(30);

$customerAccountLinkMock->expects($this->any())
->method('getSortOrder')
->willReturn(20);
->willReturn(0);

$nameInLayout = 'top.links';
$topLinksNameInLayout = self::STUB_TOP_LINKS_NAME_IN_LAYOUT;

$blockChildren = [
'wishListLink' => $wishListLinkMock,
'customerAccountLink' => $customerAccountLinkMock
'customerAccountLink' => $customerAccountLinkMock,
'wishListLink' => $wishListLinkMock
];

$this->navigation->setNameInLayout($nameInLayout);
$this->navigation->setNameInLayout($topLinksNameInLayout);
$this->layoutMock->expects($this->any())
->method('getChildBlocks')
->with($nameInLayout)
->with($topLinksNameInLayout)
->willReturn($blockChildren);

/* Assertion */
$this->assertEquals(
[
0 => $wishListLinkMock,
1 => $customerAccountLinkMock
0 => $customerAccountLinkMock,
1 => $wishListLinkMock
],
$this->navigation->getLinks()
);
Expand Down
10 changes: 5 additions & 5 deletions app/code/Magento/Customer/view/frontend/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@
<arguments>
<argument name="label" xsi:type="string" translate="true">My Account</argument>
<argument name="path" xsi:type="string">customer/account</argument>
<argument name="sortOrder" xsi:type="number">250</argument>
<argument name="sortOrder" xsi:type="number">1</argument>
</arguments>
</block>
<block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-1" template="Magento_Customer::account/navigation-delimiter.phtml">
<arguments>
<argument name="sortOrder" xsi:type="number">200</argument>
<argument name="sortOrder" xsi:type="number">40</argument>
</arguments>
</block>
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-address-link">
<arguments>
<argument name="label" xsi:type="string" translate="true">Address Book</argument>
<argument name="path" xsi:type="string">customer/address</argument>
<argument name="sortOrder" xsi:type="number">190</argument>
<argument name="sortOrder" xsi:type="number">50</argument>
</arguments>
</block>
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-edit-link">
<arguments>
<argument name="label" xsi:type="string" translate="true">Account Information</argument>
<argument name="path" xsi:type="string">customer/account/edit</argument>
<argument name="sortOrder" xsi:type="number">180</argument>
<argument name="sortOrder" xsi:type="number">60</argument>
</arguments>
</block>
<block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-2" template="Magento_Customer::account/navigation-delimiter.phtml">
<arguments>
<argument name="sortOrder" xsi:type="number">130</argument>
<argument name="sortOrder" xsi:type="number">90</argument>
</arguments>
</block>
</block>
Expand Down
10 changes: 7 additions & 3 deletions app/code/Magento/Customer/view/frontend/layout/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
<body>
<referenceBlock name="top.links">
<block class="Magento\Customer\Block\Account\Link" name="my-account-link">
<block class="Magento\Customer\Block\Account\Link" name="my-account-link" template="Magento_Customer::account/link/my-account.phtml">
<arguments>
<argument name="label" xsi:type="string" translate="true">My Account</argument>
<argument name="sortOrder" xsi:type="number">110</argument>
<argument name="sortOrder" xsi:type="number">1</argument>
</arguments>
</block>
<block class="Magento\Customer\Block\Account\RegisterLink" name="register-link">
Expand All @@ -20,7 +20,11 @@
</arguments>
</block>
<block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link"
template="Magento_Customer::account/link/authorization.phtml"/>
template="Magento_Customer::account/link/authorization.phtml">
<arguments>
<argument name="sortOrder" xsi:type="number">30</argument>
</arguments>
</block>
</referenceBlock>
<referenceContainer name="content">
<block class="Magento\Customer\Block\Account\AuthenticationPopup" name="authentication-popup" as="authentication-popup" template="Magento_Customer::account/authentication-popup.phtml">
Expand Down
13 changes: 7 additions & 6 deletions app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
* See COPYING.txt for license details.
*/

/** @var \Magento\Customer\Block\Account\AuthorizationLink $block */

/**
* @var \Magento\Customer\Block\Account\AuthorizationLink $block
* @var \Magento\Framework\Escaper $escaper
*/
$dataPostParam = '';
if ($block->isLoggedIn()) {
$dataPostParam = sprintf(" data-post='%s'", $block->getPostParams());
}
?>
<li class="authorization-link" data-label="<?= $block->escapeHtml(__('or')) ?>">
<a <?= /* @noEscape */ $block->getLinkAttributes() ?><?= /* @noEscape */ $dataPostParam ?>>
<?= $block->escapeHtml($block->getLabel()) ?>
</a>
<li class="link authorization-link" data-label="<?= $escaper->escapeHtml(__('or')) ?>">
<a <?= /* @noEscape */ $block->getLinkAttributes() ?>
<?= /* @noEscape */ $dataPostParam ?>><?= $escaper->escapeHtml($block->getLabel()) ?></a>
</li>
14 changes: 14 additions & 0 deletions app/code/Magento/Customer/view/frontend/templates/account/link/my-account.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

/**
* @var \Magento\Customer\Block\Account\Link $block
* @var \Magento\Framework\Escaper $escaper
*/
?>
<li class="link my-account-link">
<a <?= /* @noEscape */ $block->getLinkAttributes() ?>><?= $escaper->escapeHtml($block->getLabel()) ?></a>
</li>
2 changes: 1 addition & 1 deletion app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<arguments>
<argument name="path" xsi:type="string">downloadable/customer/products</argument>
<argument name="label" xsi:type="string" translate="true">My Downloadable Products</argument>
<argument name="sortOrder" xsi:type="number">217</argument>
<argument name="sortOrder" xsi:type="number">20</argument>
</arguments>
</block>
</referenceBlock>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<arguments>
<argument name="path" xsi:type="string">newsletter/manage</argument>
<argument name="label" xsi:type="string" translate="true">Newsletter Subscriptions</argument>
<argument name="sortOrder" xsi:type="number">40</argument>
<argument name="sortOrder" xsi:type="number">110</argument>
</arguments>
</block>
</referenceBlock>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Paypal/view/frontend/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<arguments>
<argument name="path" xsi:type="string">paypal/billing_agreement</argument>
<argument name="label" xsi:type="string" translate="true">Billing Agreements</argument>
<argument name="sortOrder" xsi:type="number">140</argument>
<argument name="sortOrder" xsi:type="number">80</argument>
</arguments>
</block>
</referenceBlock>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Review/view/frontend/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<arguments>
<argument name="path" xsi:type="string">review/customer</argument>
<argument name="label" xsi:type="string" translate="true">My Product Reviews</argument>
<argument name="sortOrder" xsi:type="number">50</argument>
<argument name="sortOrder" xsi:type="number">100</argument>
</arguments>
</block>
</referenceBlock>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Sales/view/frontend/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<arguments>
<argument name="path" xsi:type="string">sales/order/history</argument>
<argument name="label" xsi:type="string" translate="true">My Orders</argument>
<argument name="sortOrder" xsi:type="number">230</argument>
<argument name="sortOrder" xsi:type="number">10</argument>
</arguments>
</block>
</referenceBlock>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Vault/view/frontend/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<arguments>
<argument name="path" xsi:type="string">vault/cards/listaction</argument>
<argument name="label" xsi:type="string" translate="true">Stored Payment Methods</argument>
<argument name="sortOrder" xsi:type="number">160</argument>
<argument name="sortOrder" xsi:type="number">70</argument>
</arguments>
</block>
</referenceBlock>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/view/frontend/layout/customer_account.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<arguments>
<argument name="path" xsi:type="string">wishlist</argument>
<argument name="label" xsi:type="string" translate="true">My Wish List</argument>
<argument name="sortOrder" xsi:type="number">210</argument>
<argument name="sortOrder" xsi:type="number">30</argument>
</arguments>
</block>
</referenceBlock>
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Wishlist/view/frontend/layout/default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<referenceBlock name="top.links">
<block class="Magento\Wishlist\Block\Link" name="wish-list-link" after="my-account-link">
<arguments>
<argument name="sortOrder" xsi:type="number">60</argument>
<argument name="sortOrder" xsi:type="number">30</argument>
</arguments>
</block>
</referenceBlock>
Expand Down