Skip to content

Commit 2f8eb43

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch '2.4-develop' into ACP2E-3456
2 parents 223bee8 + 807f12a commit 2f8eb43

File tree

107 files changed

+706
-352
lines changed

Some content is hidden

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

107 files changed

+706
-352
lines changed

‎app/code/Magento/AwsS3/Test/Mftf/Helper/DummyMetadataCache.php

Lines changed: 12 additions & 12 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 2021 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -13,72 +13,72 @@
1313
class DummyMetadataCache implements \Magento\RemoteStorage\Driver\Adapter\Cache\CacheInterface
1414
{
1515
/**
16-
* @inheirtDoc
16+
* @inheritDoc
1717
*/
1818
public function exists(string $path): ?bool
1919
{
2020
return null;
2121
}
2222

2323
/**
24-
* @inheirtDoc
24+
* @inheritDoc
2525
*/
2626
public function getMetadata(string $path): ?array
2727
{
2828
return null;
2929
}
3030

3131
/**
32-
* @inheirtDoc
32+
* @inheritDoc
3333
*/
3434
public function flushCache(): void
3535
{
3636
}
3737

3838
/**
39-
* @inheirtDoc
39+
* @inheritDoc
4040
*/
4141
public function purgeQueue(): void
4242
{
4343
}
4444

4545
/**
46-
* @inheirtDoc
46+
* @inheritDoc
4747
*/
4848
public function moveFile(string $path, string $newpath): void
4949
{
5050
}
5151

5252
/**
53-
* @inheirtDoc
53+
* @inheritDoc
5454
*/
5555
public function copyFile(string $path, string $newpath): void
5656
{
5757
}
5858

5959
/**
60-
* @inheirtDoc
60+
* @inheritDoc
6161
*/
6262
public function deleteFile(string $path): void
6363
{
6464
}
6565

6666
/**
67-
* @inheirtDoc
67+
* @inheritDoc
6868
*/
6969
public function deleteDir(string $dirname): void
7070
{
7171
}
7272

7373
/**
74-
* @inheirtDoc
74+
* @inheritDoc
7575
*/
7676
public function updateMetadata(string $path, array $objectMetadata, bool $persist = false): void
7777
{
7878
}
7979

8080
/**
81-
* @inheirtDoc
81+
* @inheritDoc
8282
*/
8383
public function storeFileNotExists(string $path): void
8484
{

‎app/code/Magento/Backend/view/adminhtml/ui_component/design_config_listing.xml

Lines changed: 7 additions & 2 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 2015 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
@@ -16,5 +16,10 @@
1616
<label translate="true">Theme Name</label>
1717
</settings>
1818
</column>
19+
<column name="short_description" sortOrder="45">
20+
<settings>
21+
<label translate="true">Short Description</label>
22+
</settings>
23+
</column>
1924
</columns>
2025
</listing>

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

Lines changed: 5 additions & 2 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 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Catalog\Model\Product\Option\Type;
@@ -70,6 +70,7 @@ public function __construct(
7070
* @param array $values All product option values, i.e. array (option_id => mixed, option_id => mixed...)
7171
* @return $this
7272
* @throws LocalizedException
73+
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
7374
*/
7475
public function validateUserValue($values)
7576
{
@@ -92,6 +93,8 @@ public function validateUserValue($values)
9293
if (!$this->_isSingleSelection()) {
9394
if (is_string($value)) {
9495
$value = explode(',', $value);
96+
} elseif (!is_array($value)) {
97+
$value = [$value];
9598
}
9699
$valuesCollection = $option->getOptionValuesByOptionId($value, $this->getProduct()->getStoreId());
97100
$valueCount = is_array($value) ? count($value) : 0;

‎app/code/Magento/Catalog/Model/Product/Type/AbstractType.php

Lines changed: 4 additions & 3 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 2011 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Catalog\Model\Product\Type;
@@ -241,12 +241,13 @@ public function getRelationInfo()
241241
* group => array(ids)
242242
* )
243243
*
244-
* @deplacated TODO: refactor to child relation manager
244+
* @deprecated TODO: refactor to child relation manager
245245
*
246246
* @param int $parentId
247247
* @param bool $required
248248
* @return array
249249
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
250+
* @see Nothing
250251
*/
251252
public function getChildrenIds($parentId, $required = true)
252253
{

‎app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminAddProductCustomOptionActionGroup.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
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

9-
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<!-- Add custom option, title and type -->
1212
<actionGroup name="AdminAddProductCustomOptionActionGroup">
@@ -17,9 +17,10 @@
1717
<argument name="customOptionTitle" type="string"/>
1818
<argument name="customOptionType" type="string"/>
1919
</arguments>
20-
20+
2121
<scrollTo selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" stepKey="scrollToCustomizableOptionsSection"/>
2222
<waitForPageLoad stepKey="waitForScrolling"/>
23+
<conditionalClick selector="{{AdminProductCustomizableOptionsSection.customizableOptions}}" dependentSelector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}" visible="false" stepKey="openCustomOptionSection"/>
2324
<click stepKey="clickAddOptions" selector="{{AdminProductCustomizableOptionsSection.addOptionBtn}}"/>
2425
<waitForPageLoad stepKey="waitForAddProductPageLoad"/>
2526
<fillField stepKey="fillInOptionTitle" selector="{{AdminProductCustomizableOptionsSection.lastOptionTitle}}" userInput="{{customOptionTitle}}"/>

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml

Lines changed: 13 additions & 2 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

@@ -475,5 +475,16 @@
475475
<data key="is_filterable_in_grid">true</data>
476476
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
477477
</entity>
478+
<entity name="productAttributeAgeGroupDropdown" type="ProductAttribute">
479+
<data key="default_frontend_label" unique="suffix">Age Group</data>
480+
<data key="attribute_code" unique="suffix">agegroup</data>
481+
<data key="frontend_input">select</data>
482+
<data key="scope">website</data>
483+
<data key="is_required">false</data>
484+
<data key="is_unique">false</data>
485+
<data key="is_searchable">false</data>
486+
<data key="is_used_for_promo_rules">true</data>
487+
<requiredEntity type="FrontendLabel">ProductAttributeFrontendLabel</requiredEntity>
488+
</entity>
478489
</entities>
479490

‎app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeOptionData.xml

Lines changed: 14 additions & 2 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

@@ -125,4 +125,16 @@
125125
<data key="sort_order">3</data>
126126
<requiredEntity type="StoreLabel">Option14Store1</requiredEntity>
127127
</entity>
128+
<entity name="productAttributeOptionAdult" type="ProductAttributeOption">
129+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
130+
<data key="label">Adult</data>
131+
<data key="is_default">false</data>
132+
<data key="sort_order">0</data>
133+
</entity>
134+
<entity name="productAttributeOptionChildren" type="ProductAttributeOption">
135+
<var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
136+
<data key="label">children</data>
137+
<data key="is_default">false</data>
138+
<data key="sort_order">0</data>
139+
</entity>
128140
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductFormSection/AdminProductFormSection.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 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -91,6 +91,6 @@
9191
<element name="customTextAttribute" type="input" selector="//input[@name='product[{{attribute_code}}]']" parameterized="true"/>
9292
<element name="customSelectAttribute" type="select" selector="//select[@name='product[{{attribute_code}}]']" parameterized="true"/>
9393
<element name="customSwitcherAttribute" type="checkbox" selector="//input[@name='product[{{attribute_code}}]' and @value='{{checked_value}}']/parent::div[@data-role='switcher']" parameterized="true"/>
94-
94+
<element name="attributeOptionUncheckDefaultValue" type="checkbox" selector="input[name='use_default[{{attribute_code}}]']" parameterized="true"/>
9595
</section>
9696
</sections>

‎app/code/Magento/Catalog/Test/Unit/Model/CategoryRepositoryTest.php

Lines changed: 3 additions & 3 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

@@ -70,7 +70,7 @@ class CategoryRepositoryTest extends TestCase
7070
private $populateWithValuesMock;
7171

7272
/**
73-
* @inheridoc
73+
* @inheritDoc
7474
*/
7575
protected function setUp(): void
7676
{

‎app/code/Magento/Catalog/Test/Unit/Model/Product/Option/SaveHandlerTest.php

Lines changed: 3 additions & 3 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 2016 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -46,7 +46,7 @@ class SaveHandlerTest extends TestCase
4646
private $relationMock;
4747

4848
/**
49-
* @inheridoc
49+
* @inheritDoc
5050
*/
5151
protected function setUp(): void
5252
{

0 commit comments

Comments
 (0)