Skip to content

Commit b7cdedc

Browse files
pawan-adobe-securitypawan-adobe-security
authored
Merge pull request #387 from magento-cia/cia-2.4.8-beta2-develop-2.4-develop-sync-01132025
Cia 2.4.8 beta2 develop 2.4 develop sync 01132025
2 parents 8393da1 + ec81f11 commit b7cdedc

File tree

27 files changed

+99
-106
lines changed

27 files changed

+99
-106
lines changed

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

Lines changed: 1 addition & 1 deletion
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": "~8.2.0||~8.3.0"
6+
"php": "~8.2.0||~8.3.0||~8.4.0"
77
},
88
"suggest": {
99
"magento/module-page-builder": "*",

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

Lines changed: 1 addition & 1 deletion
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": "~8.2.0||~8.3.0"
11+
"php": "~8.2.0||~8.3.0||~8.4.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

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

Lines changed: 1 addition & 1 deletion
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": "~8.2.0||~8.3.0"
11+
"php": "~8.2.0||~8.3.0||~8.4.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

‎app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php

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

77
declare(strict_types=1);
@@ -15,11 +15,6 @@
1515
use Magento\PageBuilder\Model\Stage\Config;
1616
use Magento\Framework\Serialize\Serializer\Json;
1717

18-
/**
19-
* Class Render
20-
*
21-
* @api
22-
*/
2318
class Render extends Template
2419
{
2520
/**
@@ -56,7 +51,7 @@ public function __construct(
5651
Config $config,
5752
Json $json,
5853
array $data = [],
59-
Minification $minification = null
54+
?Minification $minification = null
6055
) {
6156
parent::__construct($context, $data);
6257
$this->fileManager = $fileManager;

‎app/code/Magento/PageBuilder/Block/WysiwygSetup.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 2018 Adobe
4+
* All Rights Reserved.
55
*/
66

77
declare(strict_types=1);
@@ -49,7 +49,7 @@ public function __construct(
4949
Context $context,
5050
ConfigInterface $config,
5151
array $data = [],
52-
FrontendInterface $cache = null,
52+
?FrontendInterface $cache = null,
5353
?RandomKey $sessionRandomKey = null
5454
) {
5555
$this->config = $config;

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

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

@@ -70,10 +70,10 @@ public function __construct(
7070
array $components = [],
7171
array $data = [],
7272
array $config = [],
73-
PageBuilderConfig $pageBuilderConfig = null,
73+
?PageBuilderConfig $pageBuilderConfig = null,
7474
bool $overrideSnapshot = false,
75-
Repository $assetRepo = null,
76-
AuthorizationInterface $authorization = null
75+
?Repository $assetRepo = null,
76+
?AuthorizationInterface $authorization = null
7777
) {
7878
$this->assetRepo = $assetRepo ?: ObjectManager::getInstance()->get(Repository::class);
7979
$this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class);

‎app/code/Magento/PageBuilder/Component/Form/HtmlCode.php

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

77
namespace Magento\PageBuilder\Component\Form;
@@ -19,7 +19,7 @@
1919
*/
2020
class HtmlCode extends \Magento\Ui\Component\Form\Field
2121
{
22-
const HTML_ID_PLACEHOLDER = 'HTML_ID_PLACEHOLDER';
22+
public const HTML_ID_PLACEHOLDER = 'HTML_ID_PLACEHOLDER';
2323

2424
/**
2525
* @var BackendUrlInterface
@@ -63,7 +63,7 @@ public function __construct(
6363
BackendUrlInterface $backendUrl,
6464
Images $imagesHelper,
6565
VariableConfig $variableConfig,
66-
OpenDialogUrl $openDialogUrl = null,
66+
?OpenDialogUrl $openDialogUrl = null,
6767
$currentTreePath = 'wysiwyg',
6868
$components = [],
6969
array $data = []

‎app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php

Lines changed: 5 additions & 5 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 2017 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\PageBuilder\Controller\Adminhtml\ContentType\Image;
77

@@ -17,9 +17,9 @@
1717
*/
1818
class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
1919
{
20-
const UPLOAD_DIR = 'wysiwyg';
20+
public const UPLOAD_DIR = 'wysiwyg';
2121

22-
const ADMIN_RESOURCE = 'Magento_Backend::content';
22+
public const ADMIN_RESOURCE = 'Magento_Backend::content';
2323

2424
/**
2525
* @var \Magento\Framework\Filesystem\DirectoryList
@@ -71,7 +71,7 @@ public function __construct(
7171
\Magento\Framework\File\UploaderFactory $uploaderFactory,
7272
\Magento\Framework\Filesystem\DirectoryList $directoryList,
7373
\Magento\Cms\Helper\Wysiwyg\Images $cmsWysiwygImages,
74-
Filesystem $filesystem = null
74+
?Filesystem $filesystem = null
7575
) {
7676
parent::__construct($context);
7777
$this->resultJsonFactory = $resultJsonFactory;

‎app/code/Magento/PageBuilder/Controller/ContentType/Preview.php

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

77
declare(strict_types=1);
@@ -20,6 +20,7 @@
2020
* @deprecated use \Magento\PageBuilder\Controller\Adminhtml\Stage\Preview
2121
*
2222
* @api
23+
* @see MC-16152
2324
*/
2425
class Preview extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
2526
{
@@ -43,7 +44,7 @@ class Preview extends \Magento\Framework\App\Action\Action implements HttpPostAc
4344
public function __construct(
4445
\Magento\Backend\App\Action\Context $context,
4546
\Magento\PageBuilder\Model\Stage\RendererPool $rendererPool,
46-
\Magento\Backend\Model\Auth $auth = null
47+
?\Magento\Backend\Model\Auth $auth = null
4748
) {
4849
parent::__construct($context);
4950

@@ -70,7 +71,7 @@ public function execute()
7071

7172
return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData($result);
7273
}
73-
74+
// @phpstan-ignore-next-line
7475
$this->_forward('noroute');
7576
}
7677
}

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

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

77
declare(strict_types=1);
@@ -43,9 +43,9 @@ class SimpleOption implements OptionInterface
4343
*/
4444
public function __construct(
4545
string $label,
46-
string $sortDirection = null,
47-
string $attributeField = null,
48-
string $secondarySortDirection = null
46+
?string $sortDirection = null,
47+
?string $attributeField = null,
48+
?string $secondarySortDirection = null
4949
) {
5050
$this->label = $label;
5151
$this->sortDirection = $sortDirection;

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

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

@@ -38,7 +38,7 @@ public function createDocumentFragment(): DocumentFragmentInterface;
3838
* @param string $value [optional]
3939
* @return ElementInterface
4040
*/
41-
public function createElement(string $name, string $value = null);
41+
public function createElement(string $name, ?string $value = null);
4242

4343
/**
4444
* Returns the first element matching the specified selector.
@@ -62,7 +62,7 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface;
6262
* @param DOMNode|null $node
6363
* @return string
6464
*/
65-
public function saveHTML(DOMNode $node = null): string;
65+
public function saveHTML(?DOMNode $node = null): string;
6666

6767
/**
6868
* Closes the stream and any underlying resources.

‎app/code/Magento/PageBuilder/Model/Dom/Document.php

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

@@ -73,7 +73,7 @@ public function createDocumentFragment(): DocumentFragmentInterface
7373
/**
7474
* @inheritDoc
7575
*/
76-
public function createElement(string $name, string $value = null): ElementInterface
76+
public function createElement(string $name, ?string $value = null): ElementInterface
7777
{
7878
return $this->objectManager->create(
7979
ElementInterface::class,
@@ -106,7 +106,7 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface
106106
/**
107107
* @inheritDoc
108108
*/
109-
public function saveHTML(DOMNode $node = null): string
109+
public function saveHTML(?DOMNode $node = null): string
110110
{
111111
return $this->document->saveHTML($node);
112112
}

‎app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php

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

77
declare(strict_types=1);
@@ -62,7 +62,7 @@ public function __construct(
6262
$resourceModel,
6363
$model = Document::class,
6464
$connection = null,
65-
AbstractDb $resource = null
65+
?AbstractDb $resource = null
6666
) {
6767
$this->resourceModel = $resourceModel;
6868
$this->model = $model;
@@ -128,7 +128,7 @@ public function getSearchCriteria()
128128
* @return $this
129129
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
130130
*/
131-
public function setSearchCriteria(SearchCriteriaInterface $searchCriteria = null)
131+
public function setSearchCriteria(?SearchCriteriaInterface $searchCriteria = null)
132132
{
133133
return $this;
134134
}
@@ -162,7 +162,7 @@ public function setTotalCount($totalCount)
162162
* @return $this
163163
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
164164
*/
165-
public function setItems(array $items = null)
165+
public function setItems(?array $items = null)
166166
{
167167
return $this;
168168
}

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

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

77
declare(strict_types=1);
@@ -24,17 +24,17 @@
2424
*/
2525
class Config
2626
{
27-
const DEFAULT_PREVIEW_COMPONENT = 'Magento_PageBuilder/js/content-type/preview';
28-
const DEFAULT_MASTER_COMPONENT = 'Magento_PageBuilder/js/content-type/master';
27+
public const DEFAULT_PREVIEW_COMPONENT = 'Magento_PageBuilder/js/content-type/preview';
28+
public const DEFAULT_MASTER_COMPONENT = 'Magento_PageBuilder/js/content-type/master';
2929

30-
const XML_PATH_COLUMN_GRID_DEFAULT = 'cms/pagebuilder/column_grid_default';
31-
const XML_PATH_COLUMN_GRID_MAX = 'cms/pagebuilder/column_grid_max';
30+
public const XML_PATH_COLUMN_GRID_DEFAULT = 'cms/pagebuilder/column_grid_default';
31+
public const XML_PATH_COLUMN_GRID_MAX = 'cms/pagebuilder/column_grid_max';
3232

33-
const ROOT_CONTAINER_NAME = 'root-container';
33+
public const ROOT_CONTAINER_NAME = 'root-container';
3434

35-
const TEMPLATE_DELETE_RESOURCE = 'Magento_PageBuilder::template_delete';
36-
const TEMPLATE_SAVE_RESOURCE = 'Magento_PageBuilder::template_save';
37-
const TEMPLATE_APPLY_RESOURCE = 'Magento_PageBuilder::template_apply';
35+
public const TEMPLATE_DELETE_RESOURCE = 'Magento_PageBuilder::template_delete';
36+
public const TEMPLATE_SAVE_RESOURCE = 'Magento_PageBuilder::template_save';
37+
public const TEMPLATE_APPLY_RESOURCE = 'Magento_PageBuilder::template_apply';
3838

3939
private const CONTENT_TYPE_CACHE_ID = 'CONTENT_TYPE';
4040
private const TINY_MCE_CONFIG_CACHE_ID = 'TINY_MCE_CONFIG';
@@ -158,11 +158,11 @@ public function __construct(
158158
\Magento\PageBuilder\Model\WidgetInitializerConfig $widgetInitializerConfig,
159159
array $rootContainerConfig = [],
160160
array $data = [],
161-
\Magento\Widget\Model\Widget\Config $widgetConfig = null,
162-
\Magento\Variable\Model\Variable\Config $variableConfig = null,
163-
AuthorizationInterface $authorization = null,
164-
FrontendInterface $cache = null,
165-
Json $serializer = null,
161+
?\Magento\Widget\Model\Widget\Config $widgetConfig = null,
162+
?\Magento\Variable\Model\Variable\Config $variableConfig = null,
163+
?AuthorizationInterface $authorization = null,
164+
?FrontendInterface $cache = null,
165+
?Json $serializer = null,
166166
?RandomKey $sessionRandomKey = null
167167
) {
168168
$this->config = $config;

‎app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.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 2018 Adobe
4+
* All Rights Reserved.
55
*/
66

77
declare(strict_types=1);
@@ -46,7 +46,7 @@ public function __construct(
4646
\Magento\PageBuilder\Model\Config $config,
4747
\Magento\Framework\View\Element\BlockFactory $blockFactory,
4848
ResultFactory $resultFactory,
49-
Template $templateFilter = null
49+
?Template $templateFilter = null
5050
) {
5151
$this->config = $config;
5252
$this->blockFactory = $blockFactory;

0 commit comments

Comments
 (0)