Skip to content

Commit 46e8f10

Browse files
mmansoor-magentommansoor-magento
authored
Merge pull request #159 from magento-cia/2.4.5-develop-2.4-develop-sync-041922
Sync of 2.4.5-develop with 2.4-develop
2 parents 1efd1e8 + 016088a commit 46e8f10

File tree

239 files changed

+2878
-3037
lines changed

Some content is hidden

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

239 files changed

+2878
-3037
lines changed

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageContentTypeToCMSPageTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageAddImageIntoPageBuilderStageTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageInvalidFileTypeValidationTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<group value="pagebuilder"/>
1818
<group value="pagebuilder-image"/>
1919
<group value="remote_storage_aws_s3"/>
20+
<group value="skip_in_cloud_native_s3"/>
2021
<group value="remote_storage_aws_s3_pagebuilder"/>
2122
</annotations>
2223
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderImageTest/AwsS3ImageRemoveImageFromStageTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-image"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderCreateTemplateOnCMSBlockForPageAndApplyTemplateToCatalogCategory.xml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<group value="pagebuilder-cms-block"/>
2222
<group value="pagebuilder-cms-category"/>
2323
<group value="remote_storage_aws_s3"/>
24+
<group value="skip_in_cloud_native_s3"/>
2425
<group value="remote_storage_aws_s3_pagebuilder"/>
2526
</annotations>
2627
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderDeleteTemplate.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderTemplateTests/AwsS3PageBuilderVerifySaveContentAsTemplateModalAndApplyTemplateSlideOut.xml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<group value="pagebuilder"/>
2020
<group value="pagebuilder-templates"/>
2121
<group value="remote_storage_aws_s3"/>
22+
<group value="skip_in_cloud_native_s3"/>
2223
<group value="remote_storage_aws_s3_pagebuilder"/>
2324
</annotations>
2425
<before>

‎app/code/Magento/AwsS3PageBuilder/Test/Mftf/Test/AdminPageBuilderVideoTest/AwsS3CanAddVideoToColumnTest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<group value="pagebuilder-column"/>
2121
<group value="pagebuilder-video"/>
2222
<group value="remote_storage_aws_s3"/>
23+
<group value="skip_in_cloud_native_s3"/>
2324
<group value="remote_storage_aws_s3_pagebuilder"/>
2425
</annotations>
2526
<before>

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Aws S3 Page Builder module",
44
"require": {
55
"magento/framework": "*",
6-
"php": "~7.4.0||~8.0.0||~8.1.0"
6+
"php": "~7.4.0||~8.1.0"
77
},
88
"suggest": {
99
"magento/module-page-builder": "*",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-catalog": "*",
1010
"magento/framework": "*",
11-
"php": "~7.4.0||~8.0.0||~8.1.0"
11+
"php": "~7.4.0||~8.1.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/module-page-builder-analytics": "*",
99
"magento/module-cms": "*",
1010
"magento/framework": "*",
11-
"php": "~7.4.0||~8.0.0||~8.1.0"
11+
"php": "~7.4.0||~8.1.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

‎app/code/Magento/PageBuilder/Api/Data/TemplateInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
/**
1212
* Template Manager template interface
13+
*
14+
* @api
1315
*/
1416
interface TemplateInterface extends ExtensibleDataInterface
1517
{

‎app/code/Magento/PageBuilder/Api/Data/TemplateSearchResultsInterface.php

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
use Magento\Framework\Api\SearchResultsInterface;
1010

11+
/**
12+
* @api
13+
*/
1114
interface TemplateSearchResultsInterface extends SearchResultsInterface
1215
{
1316
/**

‎app/code/Magento/PageBuilder/Api/TemplateRepositoryInterface.php

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
use Magento\Framework\Exception\LocalizedException;
1313
use Magento\Framework\Exception\NoSuchEntityException;
1414

15+
/**
16+
* @api
17+
*/
1518
interface TemplateRepositoryInterface
1619
{
1720
/**

‎app/code/Magento/PageBuilder/Block/Adminhtml/System/Config/SwitchAttributeType.php

+10-5
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,23 @@
88

99
namespace Magento\PageBuilder\Block\Adminhtml\System\Config;
1010

11+
use Magento\Backend\Block\Template\Context;
12+
use Magento\Config\Block\System\Config\Form\Field;
13+
use Magento\Framework\Phrase;
14+
1115
/**
1216
* Class SwitchAttributeType renders modal window to confirm changing attribute type
1317
*
18+
* @api
1419
*/
15-
class SwitchAttributeType extends \Magento\Config\Block\System\Config\Form\Field
20+
class SwitchAttributeType extends Field
1621
{
1722
/**
18-
* @param \Magento\Backend\Block\Template\Context $context
23+
* @param Context $context
1924
* @param array $data
2025
*/
2126
public function __construct(
22-
\Magento\Backend\Block\Template\Context $context,
27+
Context $context,
2328
array $data = []
2429
) {
2530
parent::__construct($context, $data);
@@ -38,9 +43,9 @@ public function getModalSelector() : string
3843
/**
3944
* Get text for the modal title heading when user switches to disable
4045
*
41-
* @return \Magento\Framework\Phrase
46+
* @return Phrase
4247
*/
43-
public function getModalTitleText() : \Magento\Framework\Phrase
48+
public function getModalTitleText() : Phrase
4449
{
4550
return __('Product data may be lost');
4651
}

‎app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
namespace Magento\PageBuilder\Component\Form\Element;
99

10+
use Magento\Catalog\Setup\CategorySetup;
1011
use Magento\Framework\App\ObjectManager;
1112
use Magento\Framework\Data\FormFactory;
1213
use Magento\Framework\View\Asset\Repository;
@@ -17,7 +18,6 @@
1718
use Magento\PageBuilder\Model\Config as PageBuilderConfig;
1819
use Magento\PageBuilder\Model\State as PageBuilderState;
1920
use Magento\PageBuilder\Model\Stage\Config as Config;
20-
use Magento\Framework\View\ConfigInterface as ViewConfigInterface;
2121

2222
/**
2323
* Updates wysiwyg element with Page Builder specific config
@@ -45,11 +45,10 @@ class Wysiwyg extends \Magento\Ui\Component\Form\Element\Wysiwyg
4545
* @param array $config
4646
* @param PageBuilderConfig|null $pageBuilderConfig
4747
* @param bool $overrideSnapshot
48-
* @param Repository $assetRepo
48+
* @param Repository|null $assetRepo
4949
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
5050
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
5151
* @SuppressWarnings(PHPMD.NPathComplexity)
52-
* @throws \Magento\Framework\Exception\NoSuchEntityException
5352
*/
5453
public function __construct(
5554
ContextInterface $context,
@@ -66,14 +65,14 @@ public function __construct(
6665
Repository $assetRepo = null
6766
) {
6867
$this->assetRepo = $assetRepo ?: ObjectManager::getInstance()->get(Repository::class);
69-
$wysiwygConfigData = isset($config['wysiwygConfigData']) ? $config['wysiwygConfigData'] : [];
68+
$wysiwygConfigData = $config['wysiwygConfigData'] ?? [];
7069

7170
// If a dataType is present we're dealing with an attribute
7271
if (isset($config['dataType'])) {
7372
try {
7473
$attribute = $attrRepository->get($data['name']);
7574

76-
if ($attribute) {
75+
if ($attribute && $attribute->getEntityTypeId() === CategorySetup::CATEGORY_ENTITY_TYPE_ID) {
7776
$config['wysiwyg'] = (bool)$attribute->getIsWysiwygEnabled();
7877
}
7978
} catch (NoSuchEntityException $e) {

‎app/code/Magento/PageBuilder/Model/Catalog/Sorting/OptionInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
/**
1212
* Interface OptionInterface
13+
*
14+
* @api
1315
*/
1416
interface OptionInterface
1517
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/AttrInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for Attr wrappers
12+
*
13+
* @api
1214
*/
1315
interface AttrInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/CharacterDataInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for CharacterData wrappers
12+
*
13+
* @api
1214
*/
1315
interface CharacterDataInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/CommentInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for Comment wrappers
12+
*
13+
* @api
1214
*/
1315
interface CommentInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentFragmentInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for DocumentFragment wrappers
12+
*
13+
* @api
1214
*/
1315
interface DocumentFragmentInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
/**
1414
* Interface for Document wrappers
15+
*
16+
* @api
1517
*/
1618
interface DocumentInterface
1719
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentTypeInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for DocumentType wrappers
12+
*
13+
* @api
1214
*/
1315
interface DocumentTypeInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/ElementInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
/**
1313
* Interface for Element wrappers
14+
*
15+
* @api
1416
*/
1517
interface ElementInterface
1618
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlCollectionInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for HtmlCollection wrappers
12+
*
13+
* @api
1214
*/
1315
interface HtmlCollectionInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/HtmlDocumentInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for HtmlDocument wrappers
12+
*
13+
* @api
1214
*/
1315
interface HtmlDocumentInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for Node wrappers
12+
*
13+
* @api
1214
*/
1315
interface NodeInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/NodeListInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for NodeList wrappers
12+
*
13+
* @api
1214
*/
1315
interface NodeListInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/PropertyAttributeInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for PropertyAttribute wrappers
12+
*
13+
* @api
1214
*/
1315
interface PropertyAttributeInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/StringMapInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for StringMap wrappers
12+
*
13+
* @api
1214
*/
1315
interface StringMapInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/TextInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for Text wrappers
12+
*
13+
* @api
1214
*/
1315
interface TextInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/TokenListInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for TokenList wrappers
12+
*
13+
* @api
1214
*/
1315
interface TokenListInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Dom/Adapter/XmlDocumentInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
/**
1111
* Interface for XmlDocument wrappers
12+
*
13+
* @api
1214
*/
1315
interface XmlDocumentInterface
1416
{

‎app/code/Magento/PageBuilder/Model/Stage/RendererInterface.php

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
/**
1212
* Provides an interface for individual content type renderers for the stage
13+
*
14+
* @api
1315
*/
1416
interface RendererInterface
1517
{

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeColumnActionGroup/DragColumnToColumnGroupActionGroup.xml

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="dragColumnToColumnGroup">
11+
<arguments>
12+
<argument name="contentTypeIndex" defaultValue="1" type="string"/>
13+
<argument name="containerTargetIndex" defaultValue="1" type="string"/>
14+
<argument name="offsetXCoordinate" defaultValue="null" type="string"/>
15+
<argument name="offsetYCoordinate" defaultValue="null" type="string"/>
16+
<argument name="pageBuilderArea" defaultValue="" type="string"/>
17+
</arguments>
18+
<click selector="{{pageBuilderArea}}{{PageBuilderPanel.searchPanel}}" stepKey="lostFocus"/>
19+
<waitForElementVisible time="30" selector="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel('Columns')}}" stepKey="waitForContentTypeInPanel"/>
20+
<dragAndDrop selector1="{{pageBuilderArea}}{{PageBuilderPanel.draggableContentTypeInPanel('Columns')}}" selector2="{{PageBuilderStage.contentTypeContainer('column', containerTargetIndex)}}" x="{{offsetXCoordinate}}" y="{{offsetYCoordinate}}" stepKey="dropContentTypeIntoStage"/>
21+
<waitForPageLoad stepKey="waitForAnimation" time="30"/>
22+
<dontSeeJsError stepKey="doNotSeeJSErrorInConsole"/>
23+
<waitForElementVisible time="10" selector="{{PageBuilderStage.contentTypeInStageByIndex('column', contentTypeIndex)}}" stepKey="waitForContentTypeInStage"/>
24+
<waitForPageLoad stepKey="waitForToolbarsToLoad" time="30"/>
25+
</actionGroup>
26+
</actionGroups>

0 commit comments

Comments
 (0)