Skip to content

Commit 5fe8872

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into PR_2025_05_16
2 parents d9735ef + a04b0ef commit 5fe8872

File tree

11 files changed

+59
-54
lines changed

11 files changed

+59
-54
lines changed

‎app/code/Magento/Backend/App/Area/FrontNameResolver.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,10 @@ public function getFrontName($checkHost = false)
107107
if ($checkHost && !$this->isHostBackend()) {
108108
return false;
109109
}
110-
$isCustomPathUsed = (bool)(string)$this->config->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_PATH);
111-
if ($isCustomPathUsed) {
112-
return (string)$this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH);
113-
}
114-
return $this->defaultFrontName;
110+
111+
return $this->config->isSetFlag(self::XML_PATH_USE_CUSTOM_ADMIN_PATH)
112+
? (string)$this->config->getValue(self::XML_PATH_CUSTOM_ADMIN_PATH)
113+
: $this->defaultFrontName;
115114
}
116115

117116
/**
@@ -127,9 +126,8 @@ public function isHostBackend()
127126
if (!$this->request->getServer('HTTP_HOST')) {
128127
return false;
129128
}
130-
131-
if ($this->scopeConfig->getValue(self::XML_PATH_USE_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE)) {
132-
$backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL, ScopeInterface::SCOPE_STORE);
129+
if ($this->scopeConfig->isSetFlag(self::XML_PATH_USE_CUSTOM_ADMIN_URL)) {
130+
$backendUrl = $this->scopeConfig->getValue(self::XML_PATH_CUSTOM_ADMIN_URL);
133131
} else {
134132
$xmlPath = $this->request->isSecure() ? Store::XML_PATH_SECURE_BASE_URL : Store::XML_PATH_UNSECURE_BASE_URL;
135133
$backendUrl = $this->config->getValue($xmlPath);

‎app/code/Magento/Backend/Test/Unit/App/Area/FrontNameResolverTest.php

100644100755
Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,16 @@ protected function setUp(): void
8080
*/
8181
public function testIfCustomPathUsed(): void
8282
{
83-
$this->configMock
83+
$this->configMock->expects($this->once())
84+
->method('isSetFlag')
85+
->with(FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_PATH)
86+
->willReturn(true);
87+
88+
$this->configMock->expects($this->once())
8489
->method('getValue')
85-
->willReturnCallback(fn($param) => match ([$param]) {
86-
['admin/url/use_custom_path'] => true,
87-
['admin/url/custom_path'] => 'expectedValue'
88-
});
90+
->with(FrontNameResolver::XML_PATH_CUSTOM_ADMIN_PATH)
91+
->willReturn('expectedValue');
92+
8993
$this->assertEquals('expectedValue', $this->model->getFrontName());
9094
}
9195

@@ -94,15 +98,11 @@ public function testIfCustomPathUsed(): void
9498
*/
9599
public function testIfCustomPathNotUsed(): void
96100
{
97-
$this->configMock->expects(
98-
$this->once()
99-
)->method(
100-
'getValue'
101-
)->with(
102-
'admin/url/use_custom_path'
103-
)->willReturn(
104-
false
105-
);
101+
$this->configMock->expects($this->once())
102+
->method('isSetFlag')
103+
->with(FrontNameResolver::XML_PATH_USE_CUSTOM_ADMIN_PATH)
104+
->willReturn(false);
105+
106106
$this->assertEquals($this->_defaultFrontName, $this->model->getFrontName());
107107
}
108108

@@ -125,7 +125,12 @@ public function testIsHostBackend(
125125
string $customAdminUrl,
126126
bool $expectedValue
127127
): void {
128-
$this->scopeConfigMock->method('getValue')
128+
$this->scopeConfigMock
129+
->method('isSetFlag')
130+
->willReturn($useCustomAdminUrl);
131+
132+
$this->scopeConfigMock
133+
->method('getValue')
129134
->willReturnMap(
130135
[
131136
[Store::XML_PATH_UNSECURE_BASE_URL, ScopeInterface::SCOPE_STORE, null, $url],
@@ -138,7 +143,7 @@ public function testIsHostBackend(
138143
],
139144
[
140145
FrontNameResolver::XML_PATH_CUSTOM_ADMIN_URL,
141-
ScopeInterface::SCOPE_STORE,
146+
ScopeConfigInterface::SCOPE_TYPE_DEFAULT,
142147
null,
143148
$customAdminUrl
144149
]

‎app/code/Magento/Catalog/Block/Widget/Link.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ public function getHref()
8181
UrlRewrite::ENTITY_ID => $rewriteData[1],
8282
UrlRewrite::ENTITY_TYPE => $rewriteData[0],
8383
UrlRewrite::STORE_ID => $store->getId(),
84+
UrlRewrite::REDIRECT_TYPE => 0,
8485
];
8586
if (!empty($rewriteData[2]) && $rewriteData[0] == ProductUrlRewriteGenerator::ENTITY_TYPE) {
8687
$filterData[UrlRewrite::METADATA]['category_id'] = $rewriteData[2];

‎app/code/Magento/Catalog/Test/Unit/Block/Widget/LinkTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ function ($route, $params) use ($storeId) {
240240
UrlRewrite::ENTITY_ID => 'entity_id',
241241
UrlRewrite::ENTITY_TYPE => 'entity_type',
242242
UrlRewrite::STORE_ID => $this->storeManager->getStore($storeId)->getStoreId(),
243+
UrlRewrite::REDIRECT_TYPE => 0,
243244
]
244245
)
245246
->willReturn($rewrite);
@@ -319,6 +320,7 @@ public function testGetHrefWithForProductWithCategoryIdParameter()
319320
UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
320321
UrlRewrite::STORE_ID => $storeId,
321322
UrlRewrite::METADATA => ['category_id' => 'category_id'],
323+
UrlRewrite::REDIRECT_TYPE => 0,
322324
]
323325
)
324326
->willReturn(false);

‎app/code/Magento/Customer/Controller/Account/Confirmation.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2015 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -99,10 +99,7 @@ public function execute()
9999
);
100100
$this->messageManager->addSuccessMessage(__('Please check your email for confirmation key.'));
101101
return $this->getRedirect('*/*/index', ['_secure' => true]);
102-
} catch (InvalidTransitionException $e) {
103-
$this->messageManager->addSuccessMessage(__('This email does not require confirmation.'));
104-
return $this->getRedirect('*/*/index', ['_secure' => true]);
105-
} catch (NoSuchEntityException $e) {
102+
} catch (InvalidTransitionException | NoSuchEntityException $e) {
106103
$this->messageManager->addErrorMessage(__('Wrong email.'));
107104
}
108105
}

‎app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?php
22
/**
3-
*
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
65
*/
76
declare(strict_types=1);
87

@@ -173,7 +172,7 @@ public function execute()
173172
{
174173
if ($this->getRequest()->isPost()
175174
&& $this->getRequest()->getPost('email')
176-
&& $this->newsletterConfig->isActive()
175+
&& $this->newsletterConfig->isActive(ScopeInterface::SCOPE_STORE)
177176
) {
178177
$email = (string)$this->getRequest()->getPost('email');
179178

‎app/code/Magento/SalesRule/Model/Rule/Action/Discount/ByPercent.php

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\SalesRule\Model\Rule\Action\Discount;
77

@@ -60,12 +60,16 @@ protected function _calculate($rule, $item, $qty, $rulePercent)
6060
$baseItemOriginalPrice = $this->validator->getItemBaseOriginalPrice($item);
6161

6262
$_rulePct = $rulePercent / 100;
63-
$discountData->setAmount(($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct);
64-
$discountData->setBaseAmount(($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct);
65-
$discountData->setOriginalAmount(($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct);
66-
$discountData->setBaseOriginalAmount(
67-
($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct
68-
);
63+
64+
$amount = ($qty * $itemPrice - $item->getDiscountAmount()) * $_rulePct;
65+
$baseAmount = ($qty * $baseItemPrice - $item->getBaseDiscountAmount()) * $_rulePct;
66+
$originalAmount = ($qty * $itemOriginalPrice - $item->getDiscountAmount()) * $_rulePct;
67+
$baseOriginalAmount = ($qty * $baseItemOriginalPrice - $item->getBaseDiscountAmount()) * $_rulePct;
68+
69+
$discountData->setAmount(round(floatval((string) $amount), 2));
70+
$discountData->setBaseAmount(round(floatval((string) $baseAmount), 2));
71+
$discountData->setOriginalAmount(round(floatval((string) $originalAmount), 2));
72+
$discountData->setBaseOriginalAmount(round(floatval((string) $baseOriginalAmount), 2));
6973

7074
if (!$rule->getDiscountQty() || $rule->getDiscountQty() >= $qty) {
7175
$discountPercent = min(100, $item->getDiscountPercent() + $rulePercent);

‎app/code/Magento/SalesRule/Test/Unit/Model/Rule/Action/Discount/ToPercentTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -221,8 +221,8 @@ public static function calculateDataProvider()
221221
'expectedRuleDiscountQty' => 100,
222222
'expectedDiscountData' => [
223223
'amount' => 98,
224-
'baseAmount' => 59.49999999999999,
225-
'originalAmount' => 118.99999999999999,
224+
'baseAmount' => 59.50,
225+
'originalAmount' => 119,
226226
'baseOriginalAmount' => 80.5,
227227
],
228228
]

‎dev/tests/integration/testsuite/Magento/Customer/Controller/AccountTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,14 +254,13 @@ public function testActiveUserConfirmationAction()
254254
);
255255

256256
$this->dispatch('customer/account/confirmation');
257-
$this->assertRedirect($this->stringContains('customer/account/index'));
258257
$this->assertSessionMessages(
259258
$this->equalTo(
260259
[
261-
'This email does not require confirmation.',
260+
'Wrong email.',
262261
]
263262
),
264-
MessageInterface::TYPE_SUCCESS
263+
MessageInterface::TYPE_ERROR
265264
);
266265
}
267266

‎dev/tests/integration/testsuite/Magento/Newsletter/Controller/Subscriber/NewActionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2020 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -90,7 +90,7 @@ public function testNewAction(string $email, string $expectedMessage): void
9090
}
9191

9292
/**
93-
* @magentoConfigFixture newsletter/general/active 1
93+
* @magentoConfigFixture current_store newsletter/general/active 1
9494
*
9595
* @return void
9696
*/
@@ -107,7 +107,7 @@ public function testNewActionWithSubscriptionConfigEnabled(): void
107107
}
108108

109109
/**
110-
* @magentoConfigFixture newsletter/general/active 0
110+
* @magentoConfigFixture current_store newsletter/general/active 0
111111
*
112112
* @return void
113113
*/

‎dev/tests/integration/testsuite/Magento/SalesRule/Model/Rule/Action/Discount/CartFixedTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ public static function discountByPercentDataProvider()
535535
],
536536
[
537537
'percentDiscount' => 50,
538-
'expectedDiscounts' => ['simple1' => 5.72, 'simple2' => 15.27, 'totalDiscount' => -20.99]
538+
'expectedDiscounts' => ['simple1' => 5.72, 'simple2' => 15.28, 'totalDiscount' => -21]
539539
],
540540
[
541541
'percentDiscount' => 100,

0 commit comments

Comments
 (0)