Skip to content

Commit 1d66940

Browse files
engcom-Dashengcom-Dash
authored
Merge branch '2.4-develop' into accesibility-improvements
2 parents 4712237 + 38501f0 commit 1d66940

File tree

67 files changed

+2407
-1102
lines changed

Some content is hidden

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

67 files changed

+2407
-1102
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"magento/module-store": "*",
1515
"magento/module-authorization": "*",
1616
"laminas/laminas-captcha": "^2.18",
17-
"magento/laminas-db": "^1.0.0"
17+
"magento/magento-zf-db": "^3.21"
1818
},
1919
"type": "magento2-module",
2020
"license": [

‎app/code/Magento/Catalog/Model/Product/Option/Type/File/ValidatorFile.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
namespace Magento\Catalog\Model\Product\Option\Type\File;
99

10-
use Laminas\Filter\File\Rename;
11-
use Laminas\File\Transfer\Exception\PhpEnvironmentException;
1210
use Magento\Catalog\Model\Product;
1311
use Magento\Catalog\Model\Product\Exception as ProductException;
1412
use Magento\Framework\App\Filesystem\DirectoryList;
@@ -126,7 +124,6 @@ public function setProduct(Product $product)
126124
* @throws \Exception
127125
* @throws \Magento\Framework\Exception\InputException
128126
* @throws \Magento\Framework\Validator\Exception
129-
* @throws PhpEnvironmentException
130127
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
131128
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
132129
*/
@@ -184,8 +181,6 @@ public function validate($processingParams, $option)
184181
$filePath = $dispersion . '/' . $fileName;
185182
$fileFullPath = $this->mediaDirectory->getAbsolutePath($this->quotePath . $filePath);
186183

187-
$upload->addFilter(new Rename(['target' => $fileFullPath, 'overwrite' => true]));
188-
189184
if ($this->product !== null) {
190185
$this->product->getTypeInstance()->addFileQueue(
191186
[

‎app/code/Magento/Catalog/Plugin/Model/CategoryRepositoryPlugin.php‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?php
2+
/**
3+
* Copyright 2025 Adobe
4+
* All Rights Reserved.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\Catalog\Plugin\Model;
10+
11+
use Magento\Catalog\Api\Data\CategoryInterface;
12+
use Magento\Catalog\Model\CategoryRepository;
13+
14+
/**
15+
* Plugin for category repository
16+
*/
17+
class CategoryRepositoryPlugin
18+
{
19+
private const ATTRIBUTES_TO_PROCESS = [
20+
'url_key',
21+
'url_path'
22+
];
23+
24+
/**
25+
* Formats category url key and path using the default formatter.
26+
*
27+
* @param CategoryRepository $subject
28+
* @param CategoryInterface $category
29+
* @return array
30+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
31+
*/
32+
public function beforeSave(CategoryRepository $subject, CategoryInterface $category): array
33+
{
34+
foreach (self::ATTRIBUTES_TO_PROCESS as $attributeKey) {
35+
$attribute = $category->getCustomAttribute($attributeKey);
36+
if ($attribute !== null) {
37+
$value = $category->getData($attributeKey);
38+
$formattedValue = $category->formatUrlKey($value);
39+
$attribute->setValue($formattedValue);
40+
}
41+
}
42+
return [$category];
43+
}
44+
}

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminApplyTierPriceToProductTest/StoreFrontDeleteProductImagesAssignedDifferentRolesTest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -77,7 +77,7 @@
7777
<!-- Go to the product page on StoreFront and see the Base image -->
7878
<amOnPage url="{{StorefrontProductPage.url($simpleProductOne.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
7979
<waitForPageLoad stepKey="waitForPageLoad"/>
80-
<seeElement selector="{{StorefrontProductMediaSection.imageFile('/adobe-base')}}" stepKey="seeBaseImageOnProductPage"/>
80+
<seeElement selector="{{StorefrontProductMediaSection.imageFile(TestImageAdobe.filename)}}" stepKey="seeBaseImageOnProductPage"/>
8181
<!-- Go to the category page and see the Small image -->
8282
<amOnPage url="{{StorefrontCategoryPage.url($testCategory.custom_attributes[url_key]$)}}" stepKey="goToCategoryPage"/>
8383
<waitForPageLoad stepKey="waitForPageLoadingToFinish"/>

‎app/code/Magento/Catalog/Test/Unit/Plugin/Model/CategoryRepositoryPluginTest.php‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?php
2+
/**
3+
* Copyright 2025 Adobe
4+
* All Rights Reserved.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Catalog\Test\Unit\Plugin\Model;
9+
10+
use Magento\Catalog\Plugin\Model\CategoryRepositoryPlugin;
11+
use Magento\Catalog\Model\CategoryRepository;
12+
use PHPUnit\Framework\TestCase;
13+
use PHPUnit\Framework\MockObject\MockObject;
14+
use Magento\Framework\Api\AttributeInterface;
15+
use Magento\Catalog\Model\Category;
16+
17+
class CategoryRepositoryPluginTest extends TestCase
18+
{
19+
/**
20+
* @var CategoryRepositoryPlugin
21+
*/
22+
private $categoryRepositoryPluginMock;
23+
24+
/**
25+
* @var CategoryRepository|MockObject
26+
*/
27+
private $categoryRepositoryMock;
28+
29+
/**
30+
* @var Category|MockObject
31+
*/
32+
private $categoryMock;
33+
34+
protected function setUp(): void
35+
{
36+
$this->categoryRepositoryMock = $this->createMock(CategoryRepository::class);
37+
$this->categoryMock = $this->createMock(Category::class);
38+
$this->categoryRepositoryPluginMock = new CategoryRepositoryPlugin();
39+
}
40+
41+
/**
42+
* Test beforeSave method
43+
*/
44+
public function testBeforeSave()
45+
{
46+
$attributeMock = $this->createMock(AttributeInterface::class);
47+
$urlKey = 'new test Cat (1)!';
48+
$formattedUrlKey = 'new-test-cat-1';
49+
$this->categoryMock->method('getCustomAttribute')
50+
->willReturnMap([
51+
['url_key', $attributeMock],
52+
['url_path', $attributeMock],
53+
]);
54+
55+
$this->categoryMock->method('getData')
56+
->willReturn($urlKey);
57+
58+
$this->categoryMock->method('formatUrlKey')
59+
->willReturn($formattedUrlKey);
60+
61+
$result = $this->categoryRepositoryPluginMock->beforeSave($this->categoryRepositoryMock, $this->categoryMock);
62+
$this->assertSame([$this->categoryMock], $result);
63+
}
64+
}

‎app/code/Magento/Catalog/etc/webapi_rest/di.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2014 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -44,4 +44,7 @@
4444
<plugin name="reindex_after_save_product_links" type="Magento\Catalog\Plugin\Api\ProductLinkRepositoryInterface\ReindexAfterSaveProductLinksPlugin"/>
4545
<plugin name="reindex_after_delete_by_id_product_links" type="Magento\Catalog\Plugin\Api\ProductLinkRepositoryInterface\ReindexAfterDeleteByIdProductLinksPlugin"/>
4646
</type>
47+
<type name="Magento\Catalog\Model\CategoryRepository">
48+
<plugin name="format_category_url_key_rest_api" type="Magento\Catalog\Plugin\Model\CategoryRepositoryPlugin" />
49+
</type>
4750
</config>

‎app/code/Magento/CatalogGraphQl/Model/Resolver/Product/ProductName.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public function resolve(
3434
Field $field,
3535
$context,
3636
ResolveInfo $info,
37-
array $value = null,
38-
array $args = null
37+
?array $value = null,
38+
?array $args = null
3939
): string {
4040
if (!isset($value['model'])) {
4141
throw new LocalizedException(__('"model" value should be specified'));

‎app/code/Magento/CatalogSearch/Test/Mftf/Data/SearchTermData.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -11,7 +11,7 @@
1111
<entity name="SimpleTerm" type="searchTerm">
1212
<data key="search_query" unique="suffix">Query text</data>
1313
<data key="store_id">Default Store View</data>
14-
<data key="redirect" unique="suffix">http://example.com/</data>
14+
<data key="redirect" unique="suffix">https://example.com/</data>
1515
<data key="display_in_terms">No</data>
1616
</entity>
17-
</entities>
17+
</entities>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminAddOptionsToDropdownAttributeActionGroup.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminAddOptionsToDropdownAttributeActionGroup">
12+
<annotations>
13+
<description>Adds options to a product attribute of type "dropdown" in the Admin panel.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="optionIndex" type="string" defaultValue="0"/>
17+
<argument name="optionValue" type="string"/>
18+
</arguments>
19+
<click selector="{{AdminNewAttributePanel.addOption}}" stepKey="clickOnAddOption"/>
20+
<waitForElementVisible selector="{{AdminNewAttributePanel.optionAdminValue(optionIndex)}}" stepKey="waitForAdminLabel"/>
21+
<fillField selector="{{AdminNewAttributePanel.optionAdminValue(optionIndex)}}" userInput="{{optionValue}}" stepKey="fillAdminLabel"/>
22+
</actionGroup>
23+
</actionGroups>

‎app/code/Magento/ConfigurableProduct/Test/Mftf/ActionGroup/AdminRemoveOptionsFromColorAttributeActionGroup.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminRemoveOptionsFromColorAttributeActionGroup">
12+
<annotations>
13+
<description>Remove options from color attribute</description>
14+
</annotations>
15+
<click stepKey="deleteOption1" selector="{{AdminNewAttributePanel.deleteOptionByName('black')}}"/>
16+
<click stepKey="deleteOption2" selector="{{AdminNewAttributePanel.deleteOptionByName('red')}}"/>
17+
<!-- Save attribute -->
18+
<click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
19+
<waitForPageLoad time="30" stepKey="waitForSaveAttribute"/>
20+
<switchToIFrame stepKey="switchOutOfIFrame"/>
21+
</actionGroup>
22+
</actionGroups>

0 commit comments

Comments
 (0)