Skip to content

Commit 66fd676

Browse files
sidolovsidolov
authored
Merge branch '2.4-develop' into 2.4-develop-prs
2 parents b9e10ab + b2cd0c1 commit 66fd676

File tree

184 files changed

+1817
-2250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+1817
-2250
lines changed

‎app/code/Magento/Analytics/Test/Unit/ReportXml/SelectHydratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public function testRecreateWithExpression(
198198
->willReturn($this->selectMock);
199199
$withArgs = [];
200200

201-
foreach (array_keys($selectParts) as $key => $partName) {
201+
foreach (array_keys($selectParts) as $partName) {
202202
$withArgs[] = [$partName, $expectedParts[$partName]];
203203
}
204204
$this->selectMock

‎app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,7 @@ protected function setUp(): void
195195
$args = ['context' => $contextMock];
196196

197197
$testHelper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
198-
$this->controller = $testHelper->getObject(
199-
Save::class,
200-
$args
201-
);
198+
$this->controller = $testHelper->getObject(Save::class, $args);
202199
}
203200

204201
/**

‎app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,8 +1383,7 @@ public function testPrepareForCartAdvancedAllRequiredOption(): void
13831383
'getBundleOption',
13841384
'getBundleOptionsData'
13851385
]
1386-
)
1387-
->disableOriginalConstructor()
1386+
)->disableOriginalConstructor()
13881387
->getMock();
13891388
/* @var \PHPUnit\Framework\MockObject\MockObject|\Magento\Catalog\Model\Product\Option $option */
13901389
$option = $this->getMockBuilder(Option::class)
@@ -1405,8 +1404,7 @@ public function testPrepareForCartAdvancedAllRequiredOption(): void
14051404
'hasData',
14061405
'getData'
14071406
]
1408-
)
1409-
->addMethods(['getHasOptions', 'setCartQty', 'getSkipCheckRequiredOption'])
1407+
)->addMethods(['getHasOptions', 'setCartQty', 'getSkipCheckRequiredOption'])
14101408
->disableOriginalConstructor()
14111409
->getMock();
14121410
/** @var MockObject|Type $productType */
@@ -1419,7 +1417,6 @@ public function testPrepareForCartAdvancedAllRequiredOption(): void
14191417
->onlyMethods(['getItems'])
14201418
->disableOriginalConstructor()
14211419
->getMock();
1422-
14231420
$this->parentClass($group, $option, $buyRequest, $product);
14241421

14251422
$product->expects($this->any())
@@ -1444,7 +1441,6 @@ function ($key) use ($optionCollection) {
14441441
$resultValue = [0 => 5];
14451442
break;
14461443
}
1447-
14481444
return $resultValue;
14491445
}
14501446
);
@@ -1456,8 +1452,7 @@ function ($key) use ($optionCollection) {
14561452
$buyRequest->expects($this->once())
14571453
->method('getBundleOption')
14581454
->willReturn([3 => 5]);
1459-
$option
1460-
->method('getId')
1455+
$option->method('getId')
14611456
->willReturnOnConsecutiveCalls(3);
14621457
$option->expects($this->once())
14631458
->method('getRequired')

‎app/code/Magento/Bundle/Test/Unit/Ui/DataProvider/Product/Form/Modifier/BundlePanelTest.php

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -135,22 +135,20 @@ public function testModifyMeta(string $shipmentTypePath, string $dataScope): voi
135135
->willReturn([]);
136136
$this->arrayManagerMock->method('set')
137137
->willReturn([]);
138+
139+
$metaArgument = [
140+
$shipmentTypePath . BundlePanel::META_CONFIG_PATH,
141+
[],
142+
[
143+
'dataScope' => $dataScope,
144+
'validation' => [
145+
'required-entry' => false
146+
]
147+
]
148+
];
138149
$this->arrayManagerMock
139150
->method('merge')
140-
->withConsecutive(
141-
[], [], [], [], [], [], [], [], [], [], [], [],
142-
[
143-
$shipmentTypePath . BundlePanel::META_CONFIG_PATH,
144-
[],
145-
[
146-
'dataScope' => $dataScope,
147-
'validation' => [
148-
'required-entry' => false
149-
]
150-
]
151-
]
152-
153-
);
151+
->withConsecutive([], [], [], [], [], [], [], [], [], [], [], [], $metaArgument);
154152
$this->bundlePanelModel->modifyMeta($sourceMeta);
155153
}
156154

‎app/code/Magento/BundleImportExport/Test/Unit/Model/Import/Product/Type/BundleTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ protected function setUp(): void
158158
'delete',
159159
'quoteInto',
160160
'fetchAssoc'
161-
])
161+
]
162+
)
162163
->disableOriginalConstructor()
163164
->getMock();
164165
$this->select = $this->createMock(Select::class);

‎app/code/Magento/CacheInvalidate/Test/Unit/Model/PurgeCacheTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public function testSendPurgeRequest(array $hosts): void
9191
$connectWithArgs = $writeWithArgs = [];
9292

9393
foreach ($uris as $uri) {
94-
$withArgs[] = [$uri->getHost(), $uri->getPort()];
9594
$writeWithArgs[] = ['PURGE', $uri, '1.1', ['X-Magento-Tags-Pattern' => 'tags', 'Host' => $uri->getHost()]];
9695
}
9796
$this->socketAdapterMock

‎app/code/Magento/Captcha/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"magento/module-sales": "*",
1414
"magento/module-store": "*",
1515
"magento/module-authorization": "*",
16-
"laminas/laminas-captcha": "^2.10",
17-
"laminas/laminas-db": "^2.8.2",
18-
"laminas/laminas-session": "^2.10"
16+
"laminas/laminas-captcha": "^2.11.0",
17+
"laminas/laminas-db": "^2.13.4",
18+
"laminas/laminas-session": "^2.12.0"
1919
},
2020
"type": "magento2-module",
2121
"license": [

‎app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ public function execute()
168168
if (isset($categoryPostData['use_config']) && !empty($categoryPostData['use_config'])) {
169169
foreach ($categoryPostData['use_config'] as $attributeCode => $attributeValue) {
170170
if ($attributeValue) {
171-
$useConfig[] = $attributeValue;
171+
$useConfig[] = $attributeCode;
172172
$category->setData($attributeCode, null);
173173
}
174174
}

‎app/code/Magento/Catalog/Pricing/Price/TierPrice.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ function (&$priceData) {
177177
/* convert string value to float */
178178
$priceData['price_qty'] *= 1;
179179
if ($this->getConfigTaxDisplayType() === Config::DISPLAY_TYPE_BOTH) {
180-
$exclTaxPrice = $this->calculator->getAmount($priceData['price'], $this->product, true);
180+
$exclTaxPrice = $this->calculator->getAmount($priceData['price'], $this->product);
181181
$priceData['excl_tax_price'] = $exclTaxPrice;
182182
}
183183
$priceData['price'] = $this->applyAdjustment($priceData['price']);

‎app/code/Magento/Catalog/Test/Unit/Model/Attribute/Backend/TierPrice/SaveHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
class SaveHandlerTest extends TestCase
3030
{
3131
/**
32-
* Magento\Framework\TestFramework\Unit\Helper\ObjectManager
32+
* @var ObjectManager
3333
*/
3434
private $objectManager;
3535

0 commit comments

Comments
 (0)