Skip to content

Commit 3a3f6bf

Browse files
rhoerrrhoerr
authored
Changes from upstream Magento release 2.4.7-p4 (#121)
1 parent c0bbd6f commit 3a3f6bf

File tree

112 files changed

+3184
-464
lines changed

Some content is hidden

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

112 files changed

+3184
-464
lines changed

‎app/code/Magento/Backend/Block/Dashboard/Orders/Grid.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* Adminhtml dashboard recent orders grid
1515
*
1616
* @api
17-
* @author Magento Core Team <[email protected]>
1817
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1918
* @since 100.0.2
2019
*/
@@ -152,7 +151,7 @@ protected function _prepareColumns()
152151
'header' => __('Total'),
153152
'sortable' => false,
154153
'type' => 'currency',
155-
'currency_code' => $baseCurrencyCode,
154+
'currency_code' => $this->_escaper->escapeHtml($baseCurrencyCode),
156155
'index' => 'revenue'
157156
]
158157
);

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClickAddOptionForBundleItemsActionGroup.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
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="AdminClickAddOptionForBundleItemsActionGroup">
12+
<annotations>
13+
<description>Click 'Add Option' button for bundle items.</description>
14+
</annotations>
15+
16+
<click selector="{{AdminProductFormBundleSection.addOption}}" stepKey="clickAddOption"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/Weight.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ public function getElementHtml()
122122
$html .= '<label class="admin__addon-suffix" for="' .
123123
$this->getHtmlId() .
124124
'"><span>' .
125-
$this->directoryHelper->getWeightUnit() .
125+
$this->_escaper->escapeHtml($this->directoryHelper->getWeightUnit()) .
126126
'</span></label></div>';
127127

128128
if ($afterElementJs = $this->getAfterElementJs()) {

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,14 @@
7979
<data key="filename">png</data>
8080
<data key="file_extension">png</data>
8181
</entity>
82+
<entity name="placeholderDummyBaseImage" type="imageFile">
83+
<data key="file">Dummy(3).jpg</data>
84+
<data key="name">Dummy(3)</data>
85+
<data key="extension">jpg</data>
86+
</entity>
87+
<entity name="PageBuilderBackgroundImage_LargerThan2MB" type="imageFile">
88+
<data key="file">LargerThan2MB.jpg</data>
89+
<data key="name">LargerThan2MB</data>
90+
<data key="extension">jpg</data>
91+
</entity>
8292
</entities>

‎app/code/Magento/Catalog/Test/Mftf/Test/EndToEndB2CAdminTest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,16 +244,16 @@
244244
<!--Admin deletes category-->
245245
<comment userInput="Admin deletes category" stepKey="deleteCategoryComment"/>
246246
<actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="onCategoryPageToDeleteCategory"/>
247+
<actionGroup ref="AdminDeleteCategoryByNameActionGroup" stepKey="cleanSimpleSubCategory">
248+
<argument name="categoryName" value="SimpleSubCategory"/>
249+
</actionGroup>
247250
<actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteCategory">
248251
<argument name="categoryEntity" value="_defaultCategory"/>
249252
</actionGroup>
250253

251254
<!--@TODO Move cleanup to "after" when MQE-830 is resolved-->
252255
<!--Clean up categories-->
253256
<comment userInput="Clean up categories" stepKey="cleanupCategoriesComment"/>
254-
<actionGroup ref="DeleteCategoryActionGroup" stepKey="cleanSimpleSubCategory">
255-
<argument name="categoryEntity" value="SimpleSubCategory"/>
256-
</actionGroup>
257257
<!--Clean up products-->
258258
<comment userInput="Clean up simple product" stepKey="cleanUpSimpleProduct"/>
259259
<actionGroup ref="DeleteProductUsingProductGridActionGroup" stepKey="deleteSimpleProduct">

‎app/code/Magento/Cms/Test/Fixture/Block.php‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
11
<?php
2-
/************************************************************************
3-
*
4-
* Copyright 2023 Adobe
2+
/**
3+
* Copyright 2024 Adobe
54
* All Rights Reserved.
6-
*
7-
* NOTICE: All information contained herein is, and remains
8-
* the property of Adobe and its suppliers, if any. The intellectual
9-
* and technical concepts contained herein are proprietary to Adobe
10-
* and its suppliers and are protected by all applicable intellectual
11-
* property laws, including trade secret and copyright laws.
12-
* Dissemination of this information or reproduction of this material
13-
* is strictly forbidden unless prior written permission is obtained
14-
* from Adobe.
15-
* ************************************************************************
165
*/
176
declare(strict_types=1);
187

‎app/code/Magento/Cms/Test/Mftf/Section/TinyMCESection/TinyMCESection.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@
66
*/
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1010
<section name="TinyMCESection">
1111
<element name="checkIfContentTabOpen" type="button" selector="//span[text()='Content']/parent::strong/parent::*[@data-state-collapsible='closed']"/>
1212
<element name="CheckIfTabExpand" type="button" selector="//div[@data-state-collapsible='closed']//span[text()='Content']"/>
1313
<element name="TinyMCE" type="text" selector=".tox-tinymce"/>
1414
<element name="InsertWidgetBtn" type="button" selector=".action-add-widget"/>
15-
<element name="InsertWidgetIcon" type="button" selector="button[aria-label='Insert Widget']" timeout="30"/>
15+
<element name="InsertWidgetIcon" type="button" selector="button[title='Insert Widget']" timeout="30"/>
1616
<element name="InsertVariableBtn" type="button" selector=".scalable.add-variable.plugin"/>
17-
<element name="InsertVariableIcon" type="button" selector="button[aria-label='Insert Variable']"/>
17+
<element name="InsertVariableIcon" type="button" selector="button[title='Insert Variable']"/>
1818
<element name="InsertImageBtn" type="button" selector=".scalable.action-add-image.plugin"/>
19-
<element name="InsertImageIcon" type="button" selector="button[aria-label='Insert/edit image']" timeout="30"/>
20-
<element name="Style" type="button" selector="button[aria-label='Block Paragraph']"/>
21-
<element name="Bold" type="button" selector="button[aria-label='Bold']"/>
22-
<element name="Italic" type="button" selector="button[aria-label='Italic']"/>
23-
<element name="Underline" type="button" selector="button[aria-label='Underline']"/>
24-
<element name="AlignLeft" type="button" selector="button[aria-label='Align left']"/>
25-
<element name="AlignCenter" type="button" selector="button[aria-label='Align center']"/>
26-
<element name="AlignRight" type="button" selector="button[aria-label='Align right']"/>
27-
<element name="Bullet" type="button" selector="div[aria-label='Bullet list']"/>
28-
<element name="Numlist" type="button" selector="div[aria-label='Numbered list']"/>
29-
<element name="InsertLink" type="button" selector="button[aria-label='Insert/edit link']"/>
30-
<element name="InsertTable" type="button" selector="button[aria-label='Table']"/>
31-
<element name="SpecialCharacter" type="button" selector="button[aria-label='Special character']"/>
19+
<element name="InsertImageIcon" type="button" selector="button[title='Insert/edit image']" timeout="30"/>
20+
<element name="Style" type="button" selector="button[title='Block Paragraph']"/>
21+
<element name="Bold" type="button" selector="button[title='Bold']"/>
22+
<element name="Italic" type="button" selector="button[title='Italic']"/>
23+
<element name="Underline" type="button" selector="button[title='Underline']"/>
24+
<element name="AlignLeft" type="button" selector="button[title='Align left']"/>
25+
<element name="AlignCenter" type="button" selector="button[title='Align center']"/>
26+
<element name="AlignRight" type="button" selector="button[title='Align right']"/>
27+
<element name="Bullet" type="button" selector="div[title='Bullet list']"/>
28+
<element name="Numlist" type="button" selector="div[title='Numbered list']"/>
29+
<element name="InsertLink" type="button" selector="button[title='Insert/edit link']"/>
30+
<element name="InsertTable" type="button" selector="button[title='Table']"/>
31+
<element name="SpecialCharacter" type="button" selector="button[title='Special character']"/>
3232
<element name="WidgetButton" type="button" selector="span[class*='magento-widget mceNonEditable']"/>
3333
<element name="EditorContent" type="input" selector="#tinymce"/>
3434
<element name="Content" type="textarea" selector="textarea"/>

‎app/code/Magento/Cms/Test/Unit/Ui/Component/Listing/DataProviderTest.php‎

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
<?php
2-
/***
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
2+
/************************************************************************
3+
* Copyright 2024 Adobe
4+
* All Rights Reserved.
5+
*
6+
* NOTICE: All information contained herein is, and remains
7+
* the property of Adobe and its suppliers, if any. The intellectual
8+
* and technical concepts contained herein are proprietary to Adobe
9+
* and its suppliers and are protected by all applicable intellectual
10+
* property laws, including trade secret and copyright laws.
11+
* Dissemination of this information or reproduction of this material
12+
* is strictly forbidden unless prior written permission is obtained
13+
* from Adobe.
14+
* ***********************************************************************
515
*/
616
declare(strict_types=1);
717

@@ -18,6 +28,7 @@
1828
use Magento\Ui\Component\Container;
1929
use PHPUnit\Framework\MockObject\MockObject;
2030
use PHPUnit\Framework\TestCase;
31+
use Magento\Cms\Api\Data\PageInterface;
2132

2233
class DataProviderTest extends TestCase
2334
{
@@ -66,6 +77,17 @@ class DataProviderTest extends TestCase
6677
*/
6778
private $requestFieldName = 'id';
6879

80+
/**
81+
* @var array
82+
*/
83+
private array $pageLayoutColumns = [
84+
PageInterface::PAGE_LAYOUT,
85+
PageInterface::CUSTOM_THEME,
86+
PageInterface::CUSTOM_THEME_FROM,
87+
PageInterface::CUSTOM_THEME_TO,
88+
PageInterface::CUSTOM_ROOT_TEMPLATE
89+
];
90+
6991
protected function setUp(): void
7092
{
7193
$this->authorizationMock = $this->getMockBuilder(Authorization::class)
@@ -111,10 +133,15 @@ protected function setUp(): void
111133
*/
112134
public function testPrepareMetadata()
113135
{
114-
$this->authorizationMock->expects($this->once())
136+
$this->authorizationMock->expects($this->exactly(2))
115137
->method('isAllowed')
116-
->with('Magento_Cms::save')
117-
->willReturn(false);
138+
->willReturnMap(
139+
[
140+
['Magento_Cms::save', null, false],
141+
['Magento_Cms::save_design', null, false],
142+
143+
]
144+
);
118145

119146
$metadata = [
120147
'cms_page_columns' => [
@@ -131,6 +158,21 @@ public function testPrepareMetadata()
131158
]
132159
];
133160

161+
foreach ($this->pageLayoutColumns as $column) {
162+
$metadata['cms_page_columns']['children'][$column] = [
163+
'arguments' => [
164+
'data' => [
165+
'config' => [
166+
'editor' => [
167+
'editorType' => false
168+
],
169+
'componentType' => Container::NAME
170+
]
171+
]
172+
]
173+
];
174+
}
175+
134176
$this->assertEquals(
135177
$metadata,
136178
$this->dataProvider->prepareMetadata()

‎app/code/Magento/Cms/Ui/Component/DataProvider.php‎

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
*/
66
namespace Magento\Cms\Ui\Component;
77

8+
use Magento\Cms\Api\Data\PageInterface;
89
use Magento\Framework\Api\Filter;
910
use Magento\Framework\Api\FilterBuilder;
1011
use Magento\Framework\Api\Search\SearchCriteriaBuilder;
1112
use Magento\Framework\App\ObjectManager;
1213
use Magento\Framework\App\RequestInterface;
1314
use Magento\Framework\AuthorizationInterface;
1415
use Magento\Framework\View\Element\UiComponent\DataProvider\Reporting;
16+
use Magento\Ui\Component\Container;
1517

1618
/**
1719
* DataProvider for cms ui.
@@ -28,6 +30,17 @@ class DataProvider extends \Magento\Framework\View\Element\UiComponent\DataProvi
2830
*/
2931
private $additionalFilterPool;
3032

33+
/**
34+
* @var array
35+
*/
36+
private array $pageLayoutColumns = [
37+
PageInterface::PAGE_LAYOUT,
38+
PageInterface::CUSTOM_THEME,
39+
PageInterface::CUSTOM_THEME_FROM,
40+
PageInterface::CUSTOM_THEME_TO,
41+
PageInterface::CUSTOM_ROOT_TEMPLATE
42+
];
43+
3144
/**
3245
* @param string $name
3346
* @param string $primaryFieldName
@@ -73,6 +86,8 @@ public function __construct(
7386
* Get authorization info.
7487
*
7588
* @deprecated 101.0.7
89+
* @see nothing
90+
*
7691
* @return AuthorizationInterface|mixed
7792
*/
7893
private function getAuthorizationInstance()
@@ -101,21 +116,42 @@ public function prepareMetadata()
101116
'editorConfig' => [
102117
'enabled' => false
103118
],
104-
'componentType' => \Magento\Ui\Component\Container::NAME
119+
'componentType' => Container::NAME
105120
]
106121
]
107122
]
108123
]
109124
];
110125
}
111126

127+
if (!$this->getAuthorizationInstance()->isAllowed('Magento_Cms::save_design')) {
128+
129+
foreach ($this->pageLayoutColumns as $column) {
130+
$metadata['cms_page_columns']['children'][$column] = [
131+
'arguments' => [
132+
'data' => [
133+
'config' => [
134+
'editor' => [
135+
'editorType' => false
136+
],
137+
'componentType' => Container::NAME
138+
]
139+
]
140+
]
141+
];
142+
}
143+
}
144+
112145
return $metadata;
113146
}
114147

115148
/**
116-
* @inheritdoc
149+
* Add Filter
150+
*
151+
* @param Filter $filter
152+
* @return void
117153
*/
118-
public function addFilter(Filter $filter)
154+
public function addFilter(Filter $filter): void
119155
{
120156
if (!empty($this->additionalFilterPool[$filter->getField()])) {
121157
$this->additionalFilterPool[$filter->getField()]->addFilter($this->searchCriteriaBuilder, $filter);

‎app/code/Magento/Cms/etc/adminhtml/di.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<argument name="adapterOptions" xsi:type="array">
3939
<item name="tinymce" xsi:type="array">
4040
<item name="value" xsi:type="string">mage/adminhtml/wysiwyg/tiny_mce/tinymceAdapter</item>
41-
<item name="label" xsi:type="string" translatable="true">TinyMCE 7</item>
41+
<item name="label" xsi:type="string" translatable="true">TinyMCE 6</item>
4242
</item>
4343
</argument>
4444
</arguments>

0 commit comments

Comments
 (0)