From 624f7a19b554ebacd4d0de1ee82d5608b98ac06c Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Wed, 4 Dec 2024 16:52:57 +0530 Subject: [PATCH 01/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- app/code/Magento/AwsS3PageBuilder/composer.json | 2 +- app/code/Magento/CatalogPageBuilderAnalytics/composer.json | 2 +- app/code/Magento/CmsPageBuilderAnalytics/composer.json | 2 +- app/code/Magento/PageBuilder/composer.json | 2 +- app/code/Magento/PageBuilderAdminAnalytics/composer.json | 2 +- app/code/Magento/PageBuilderAnalytics/composer.json | 2 +- app/code/Magento/PageBuilderImageAttribute/composer.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/code/Magento/AwsS3PageBuilder/composer.json b/app/code/Magento/AwsS3PageBuilder/composer.json index c04adc65f25..d1834302d66 100644 --- a/app/code/Magento/AwsS3PageBuilder/composer.json +++ b/app/code/Magento/AwsS3PageBuilder/composer.json @@ -3,7 +3,7 @@ "description": "Aws S3 Page Builder module", "require": { "magento/framework": "*", - "php": "~8.2.0||~8.3.0" + "php": "~8.2.0||~8.3.0||~8.4.0" }, "suggest": { "magento/module-page-builder": "*", diff --git a/app/code/Magento/CatalogPageBuilderAnalytics/composer.json b/app/code/Magento/CatalogPageBuilderAnalytics/composer.json index a5e0e19854b..142d06af2a4 100644 --- a/app/code/Magento/CatalogPageBuilderAnalytics/composer.json +++ b/app/code/Magento/CatalogPageBuilderAnalytics/composer.json @@ -8,7 +8,7 @@ "magento/module-page-builder-analytics": "*", "magento/module-catalog": "*", "magento/framework": "*", - "php": "~8.2.0||~8.3.0" + "php": "~8.2.0||~8.3.0||~8.4.0" }, "type": "magento2-module", "license": [ diff --git a/app/code/Magento/CmsPageBuilderAnalytics/composer.json b/app/code/Magento/CmsPageBuilderAnalytics/composer.json index 425682f8e7c..e5c5167af89 100644 --- a/app/code/Magento/CmsPageBuilderAnalytics/composer.json +++ b/app/code/Magento/CmsPageBuilderAnalytics/composer.json @@ -8,7 +8,7 @@ "magento/module-page-builder-analytics": "*", "magento/module-cms": "*", "magento/framework": "*", - "php": "~8.2.0||~8.3.0" + "php": "~8.2.0||~8.3.0||~8.4.0" }, "type": "magento2-module", "license": [ diff --git a/app/code/Magento/PageBuilder/composer.json b/app/code/Magento/PageBuilder/composer.json index a0748617845..0f2a99d7887 100644 --- a/app/code/Magento/PageBuilder/composer.json +++ b/app/code/Magento/PageBuilder/composer.json @@ -21,7 +21,7 @@ "magento/module-wishlist": "*", "magento/module-require-js": "*", "magento/module-media-storage": "*", - "php": "~8.2.0||~8.3.0", + "php": "~8.2.0||~8.3.0||~8.4.0", "phpgt/dom": "^4.1" }, "suggest": { diff --git a/app/code/Magento/PageBuilderAdminAnalytics/composer.json b/app/code/Magento/PageBuilderAdminAnalytics/composer.json index 89ff7ad05ce..9adde8938d3 100644 --- a/app/code/Magento/PageBuilderAdminAnalytics/composer.json +++ b/app/code/Magento/PageBuilderAdminAnalytics/composer.json @@ -6,7 +6,7 @@ }, "require": { "magento/framework": "*", - "php": "~8.2.0||~8.3.0" + "php": "~8.2.0||~8.3.0||~8.4.0" }, "suggest": { "magento/module-admin-analytics": "*", diff --git a/app/code/Magento/PageBuilderAnalytics/composer.json b/app/code/Magento/PageBuilderAnalytics/composer.json index 069c22cb8b2..73ba41dbb77 100644 --- a/app/code/Magento/PageBuilderAnalytics/composer.json +++ b/app/code/Magento/PageBuilderAnalytics/composer.json @@ -5,7 +5,7 @@ "magento/module-analytics": "*", "magento/module-page-builder": "*", "magento/framework": "*", - "php": "~8.2.0||~8.3.0" + "php": "~8.2.0||~8.3.0||~8.4.0" }, "type": "magento2-module", "license": [ diff --git a/app/code/Magento/PageBuilderImageAttribute/composer.json b/app/code/Magento/PageBuilderImageAttribute/composer.json index dab4bb049dd..cef0206c953 100644 --- a/app/code/Magento/PageBuilderImageAttribute/composer.json +++ b/app/code/Magento/PageBuilderImageAttribute/composer.json @@ -3,7 +3,7 @@ "description": "Width & Height attribute - Pagebuilder image", "require": { "magento/framework": "*", - "php": "~8.2.0||~8.3.0" + "php": "~8.2.0||~8.3.0||~8.4.0" }, "type": "magento2-module", "license": [ From d174293de31273aead1de12b935885efc5cacda9 Mon Sep 17 00:00:00 2001 From: Dnyaneshwar Jambhulkar Date: Thu, 12 Dec 2024 12:19:15 +0530 Subject: [PATCH 02/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- .../PageBuilder/Block/Adminhtml/Stage/Render.php | 2 +- app/code/Magento/PageBuilder/Block/WysiwygSetup.php | 2 +- .../PageBuilder/Component/Form/Element/Wysiwyg.php | 6 +++--- .../Magento/PageBuilder/Component/Form/HtmlCode.php | 2 +- .../Controller/Adminhtml/ContentType/Image/Upload.php | 2 +- .../PageBuilder/Controller/ContentType/Preview.php | 2 +- .../PageBuilder/Model/Catalog/Sorting/SimpleOption.php | 6 +++--- .../Model/Dom/Adapter/DocumentInterface.php | 4 ++-- app/code/Magento/PageBuilder/Model/Dom/Document.php | 4 ++-- .../Model/ResourceModel/Template/Grid/Collection.php | 6 +++--- app/code/Magento/PageBuilder/Model/Stage/Config.php | 10 +++++----- .../Magento/PageBuilder/Model/Stage/Renderer/Block.php | 2 +- .../Model/Stage/Renderer/CmsStaticBlock.php | 2 +- .../Model/Stage/Renderer/WidgetDirective.php | 2 +- .../PageBuilder/Model/WidgetInitializerConfig.php | 2 +- app/code/Magento/PageBuilder/Plugin/DesignLoader.php | 2 +- .../Form/Modifier/Eav/WysiwygConfigDataProcessor.php | 2 +- 17 files changed, 29 insertions(+), 29 deletions(-) diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php index 3b4c89c8e62..dbd20013ce3 100644 --- a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php +++ b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php @@ -56,7 +56,7 @@ public function __construct( Config $config, Json $json, array $data = [], - Minification $minification = null + ?Minification $minification = null ) { parent::__construct($context, $data); $this->fileManager = $fileManager; diff --git a/app/code/Magento/PageBuilder/Block/WysiwygSetup.php b/app/code/Magento/PageBuilder/Block/WysiwygSetup.php index d30a0979c8e..7d54db1b991 100644 --- a/app/code/Magento/PageBuilder/Block/WysiwygSetup.php +++ b/app/code/Magento/PageBuilder/Block/WysiwygSetup.php @@ -49,7 +49,7 @@ public function __construct( Context $context, ConfigInterface $config, array $data = [], - FrontendInterface $cache = null, + ?FrontendInterface $cache = null, ?RandomKey $sessionRandomKey = null ) { $this->config = $config; diff --git a/app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php b/app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php index 4546d412251..15c722a509a 100644 --- a/app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php +++ b/app/code/Magento/PageBuilder/Component/Form/Element/Wysiwyg.php @@ -70,10 +70,10 @@ public function __construct( array $components = [], array $data = [], array $config = [], - PageBuilderConfig $pageBuilderConfig = null, + ?PageBuilderConfig $pageBuilderConfig = null, bool $overrideSnapshot = false, - Repository $assetRepo = null, - AuthorizationInterface $authorization = null + ?Repository $assetRepo = null, + ?AuthorizationInterface $authorization = null ) { $this->assetRepo = $assetRepo ?: ObjectManager::getInstance()->get(Repository::class); $this->authorization = $authorization ?: ObjectManager::getInstance()->get(AuthorizationInterface::class); diff --git a/app/code/Magento/PageBuilder/Component/Form/HtmlCode.php b/app/code/Magento/PageBuilder/Component/Form/HtmlCode.php index 0a16806b57b..a79388588f0 100644 --- a/app/code/Magento/PageBuilder/Component/Form/HtmlCode.php +++ b/app/code/Magento/PageBuilder/Component/Form/HtmlCode.php @@ -63,7 +63,7 @@ public function __construct( BackendUrlInterface $backendUrl, Images $imagesHelper, VariableConfig $variableConfig, - OpenDialogUrl $openDialogUrl = null, + ?OpenDialogUrl $openDialogUrl = null, $currentTreePath = 'wysiwyg', $components = [], array $data = [] diff --git a/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php b/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php index e444769ac15..9d74d6a1ce6 100644 --- a/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php +++ b/app/code/Magento/PageBuilder/Controller/Adminhtml/ContentType/Image/Upload.php @@ -71,7 +71,7 @@ public function __construct( \Magento\Framework\File\UploaderFactory $uploaderFactory, \Magento\Framework\Filesystem\DirectoryList $directoryList, \Magento\Cms\Helper\Wysiwyg\Images $cmsWysiwygImages, - Filesystem $filesystem = null + ?Filesystem $filesystem = null ) { parent::__construct($context); $this->resultJsonFactory = $resultJsonFactory; diff --git a/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php b/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php index 2ab6363b36b..6ee8d77b393 100644 --- a/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php +++ b/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php @@ -43,7 +43,7 @@ class Preview extends \Magento\Framework\App\Action\Action implements HttpPostAc public function __construct( \Magento\Backend\App\Action\Context $context, \Magento\PageBuilder\Model\Stage\RendererPool $rendererPool, - \Magento\Backend\Model\Auth $auth = null + ?\Magento\Backend\Model\Auth $auth = null ) { parent::__construct($context); diff --git a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php index 7d93c877d40..3aa7ef077d0 100644 --- a/app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php +++ b/app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php @@ -43,9 +43,9 @@ class SimpleOption implements OptionInterface */ public function __construct( string $label, - string $sortDirection = null, - string $attributeField = null, - string $secondarySortDirection = null + ?string $sortDirection = null, + ?string $attributeField = null, + ?string $secondarySortDirection = null ) { $this->label = $label; $this->sortDirection = $sortDirection; diff --git a/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php b/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php index 8445ca7d424..a8c3948cf07 100644 --- a/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php +++ b/app/code/Magento/PageBuilder/Model/Dom/Adapter/DocumentInterface.php @@ -38,7 +38,7 @@ public function createDocumentFragment(): DocumentFragmentInterface; * @param string $value [optional] * @return ElementInterface */ - public function createElement(string $name, string $value = null); + public function createElement(string $name, ?string $value = null); /** * Returns the first element matching the specified selector. @@ -62,7 +62,7 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface; * @param DOMNode|null $node * @return string */ - public function saveHTML(DOMNode $node = null): string; + public function saveHTML(?DOMNode $node = null): string; /** * Closes the stream and any underlying resources. diff --git a/app/code/Magento/PageBuilder/Model/Dom/Document.php b/app/code/Magento/PageBuilder/Model/Dom/Document.php index 2145c410a6d..904b2109443 100644 --- a/app/code/Magento/PageBuilder/Model/Dom/Document.php +++ b/app/code/Magento/PageBuilder/Model/Dom/Document.php @@ -73,7 +73,7 @@ public function createDocumentFragment(): DocumentFragmentInterface /** * @inheritDoc */ - public function createElement(string $name, string $value = null): ElementInterface + public function createElement(string $name, ?string $value = null): ElementInterface { return $this->objectManager->create( ElementInterface::class, @@ -106,7 +106,7 @@ public function querySelectorAll(string $selector): HtmlCollectionInterface /** * @inheritDoc */ - public function saveHTML(DOMNode $node = null): string + public function saveHTML(?DOMNode $node = null): string { return $this->document->saveHTML($node); } diff --git a/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php b/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php index dd45647d56f..fa23ed1392f 100644 --- a/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php +++ b/app/code/Magento/PageBuilder/Model/ResourceModel/Template/Grid/Collection.php @@ -62,7 +62,7 @@ public function __construct( $resourceModel, $model = Document::class, $connection = null, - AbstractDb $resource = null + ?AbstractDb $resource = null ) { $this->resourceModel = $resourceModel; $this->model = $model; @@ -128,7 +128,7 @@ public function getSearchCriteria() * @return $this * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function setSearchCriteria(SearchCriteriaInterface $searchCriteria = null) + public function setSearchCriteria(?SearchCriteriaInterface $searchCriteria = null) { return $this; } @@ -162,7 +162,7 @@ public function setTotalCount($totalCount) * @return $this * @SuppressWarnings(PHPMD.UnusedFormalParameter) */ - public function setItems(array $items = null) + public function setItems(?array $items = null) { return $this; } diff --git a/app/code/Magento/PageBuilder/Model/Stage/Config.php b/app/code/Magento/PageBuilder/Model/Stage/Config.php index 63e268e7465..807deff78a0 100644 --- a/app/code/Magento/PageBuilder/Model/Stage/Config.php +++ b/app/code/Magento/PageBuilder/Model/Stage/Config.php @@ -158,11 +158,11 @@ public function __construct( \Magento\PageBuilder\Model\WidgetInitializerConfig $widgetInitializerConfig, array $rootContainerConfig = [], array $data = [], - \Magento\Widget\Model\Widget\Config $widgetConfig = null, - \Magento\Variable\Model\Variable\Config $variableConfig = null, - AuthorizationInterface $authorization = null, - FrontendInterface $cache = null, - Json $serializer = null, + ?\Magento\Widget\Model\Widget\Config $widgetConfig = null, + ?\Magento\Variable\Model\Variable\Config $variableConfig = null, + ?AuthorizationInterface $authorization = null, + ?FrontendInterface $cache = null, + ?Json $serializer = null, ?RandomKey $sessionRandomKey = null ) { $this->config = $config; diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php index d1c0fe42905..74ae2a7ebe2 100644 --- a/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php +++ b/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php @@ -46,7 +46,7 @@ public function __construct( \Magento\PageBuilder\Model\Config $config, \Magento\Framework\View\Element\BlockFactory $blockFactory, ResultFactory $resultFactory, - Template $templateFilter = null + ?Template $templateFilter = null ) { $this->config = $config; $this->blockFactory = $blockFactory; diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php index bc469c7a2cf..b11484e949f 100644 --- a/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php +++ b/app/code/Magento/PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php @@ -56,7 +56,7 @@ public function __construct( WidgetDirective $widgetDirectiveRenderer, LoggerInterface $loggerInterface, HtmlFilter $htmlFilter, - Template $templateFilter = null + ?Template $templateFilter = null ) { $this->blockCollectionFactory = $blockCollectionFactory; $this->widgetDirectiveRenderer = $widgetDirectiveRenderer; diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php index d8799932735..a91a44b949f 100644 --- a/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php +++ b/app/code/Magento/PageBuilder/Model/Stage/Renderer/WidgetDirective.php @@ -41,7 +41,7 @@ class WidgetDirective implements \Magento\PageBuilder\Model\Stage\RendererInterf public function __construct( \Magento\Store\Model\StoreManagerInterface $storeManager, \Magento\Widget\Model\Template\Filter $directiveFilter, - Template $templateFilter = null + ?Template $templateFilter = null ) { $this->storeManager = $storeManager; $this->directiveFilter = $directiveFilter; diff --git a/app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php b/app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php index 2c6234e49e9..c85335d425c 100644 --- a/app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php +++ b/app/code/Magento/PageBuilder/Model/WidgetInitializerConfig.php @@ -32,7 +32,7 @@ class WidgetInitializerConfig */ public function __construct( array $config, - ConfigInterface $viewConfig = null + ?ConfigInterface $viewConfig = null ) { $this->config = $config; $this->viewConfig = $viewConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class); diff --git a/app/code/Magento/PageBuilder/Plugin/DesignLoader.php b/app/code/Magento/PageBuilder/Plugin/DesignLoader.php index 800f97ad88d..de4e79783ac 100644 --- a/app/code/Magento/PageBuilder/Plugin/DesignLoader.php +++ b/app/code/Magento/PageBuilder/Plugin/DesignLoader.php @@ -75,7 +75,7 @@ public function beforeCreate( \Magento\Catalog\Block\Product\ImageFactory $subject, Product $product, string $imageId, - array $attributes = null + ?array $attributes = null ) { if ($this->preview->isPreviewMode()) { $this->appState->emulateAreaCode( diff --git a/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php b/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php index 506c8ac0a4a..fc19cf9949e 100644 --- a/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php +++ b/app/code/Magento/PageBuilder/Ui/DataProvider/Product/Form/Modifier/Eav/WysiwygConfigDataProcessor.php @@ -23,7 +23,7 @@ class WysiwygConfigDataProcessor implements * @param Config|null $config */ public function __construct( - Config $config = null + ?Config $config = null ) { $this->config = $config ?: ObjectManager::getInstance()->get(Config::class); } From 3b33a7e06518cf2c0dd9a7f82d31bcc7a88e13af Mon Sep 17 00:00:00 2001 From: Dnyaneshwar Jambhulkar Date: Tue, 17 Dec 2024 17:06:26 +0530 Subject: [PATCH 03/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- app/code/Magento/PageBuilder/composer.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/PageBuilder/composer.json b/app/code/Magento/PageBuilder/composer.json index 0f2a99d7887..9ed4d3079df 100644 --- a/app/code/Magento/PageBuilder/composer.json +++ b/app/code/Magento/PageBuilder/composer.json @@ -1,6 +1,12 @@ { "name": "magento/module-page-builder", "description": "Page Builder module", + "repositories": [ + { + "type": "vcs", + "url": "git@github.com:djadobe16/Dom.git" + } + ], "require": { "magento/framework": "*", "magento/module-eav": "*", @@ -22,7 +28,7 @@ "magento/module-require-js": "*", "magento/module-media-storage": "*", "php": "~8.2.0||~8.3.0||~8.4.0", - "phpgt/dom": "^4.1" + "phpgt/dom": "dev-php84-support" }, "suggest": { "magento/module-review": "*" From ca769a09dacd6bbdceb12c067e823a94daac2020 Mon Sep 17 00:00:00 2001 From: Atul-glo35265 Date: Thu, 19 Dec 2024 13:12:11 +0530 Subject: [PATCH 04/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- .../testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php index 875e14d09d6..6b4eaee73dc 100644 --- a/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/PageBuilder/Model/Stage/ConfigTest.php @@ -127,7 +127,7 @@ public function testConfigShouldBeCachedWithinSameSession(): void /** * @param string|null $sessionId */ - private function startNewSession(string $sessionId = null): void + private function startNewSession(?string $sessionId = null): void { /** @var SessionManagerInterface $session */ $session = Bootstrap::getObjectManager()->get(SessionManagerInterface::class); From 2eeadd77e84297b9630f7a2a3575d20992adb909 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Mon, 23 Dec 2024 10:57:38 +0530 Subject: [PATCH 05/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- .../Magento/PageBuilder/Controller/ContentType/Preview.php | 7 ++++--- .../Magento/PageBuilder/Model/Stage/Renderer/Block.php | 4 ++-- .../PageBuilder/Model/Stage/Renderer/CmsStaticBlock.php | 4 ++-- .../PageBuilder/Model/Stage/Renderer/WidgetDirective.php | 4 ++-- .../Magento/PageBuilder/Model/WidgetInitializerConfig.php | 4 ++-- app/code/Magento/PageBuilder/Plugin/DesignLoader.php | 4 ++-- .../Form/Modifier/Eav/WysiwygConfigDataProcessor.php | 4 ++-- .../Magento/PageBuilder/Model/Stage/ConfigTest.php | 5 ++--- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php b/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php index 6ee8d77b393..9d49688343f 100644 --- a/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php +++ b/app/code/Magento/PageBuilder/Controller/ContentType/Preview.php @@ -1,7 +1,7 @@ resultFactory->create(ResultFactory::TYPE_JSON)->setData($result); } - + // @phpstan-ignore-next-line $this->_forward('noroute'); } } diff --git a/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php b/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php index 74ae2a7ebe2..75498e8b93c 100644 --- a/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php +++ b/app/code/Magento/PageBuilder/Model/Stage/Renderer/Block.php @@ -1,7 +1,7 @@ Date: Mon, 23 Dec 2024 11:20:21 +0530 Subject: [PATCH 06/13] phpgt/dom version chnage --- app/code/Magento/PageBuilder/composer.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/code/Magento/PageBuilder/composer.json b/app/code/Magento/PageBuilder/composer.json index 9ed4d3079df..865a08e8868 100644 --- a/app/code/Magento/PageBuilder/composer.json +++ b/app/code/Magento/PageBuilder/composer.json @@ -1,12 +1,6 @@ { "name": "magento/module-page-builder", "description": "Page Builder module", - "repositories": [ - { - "type": "vcs", - "url": "git@github.com:djadobe16/Dom.git" - } - ], "require": { "magento/framework": "*", "magento/module-eav": "*", @@ -28,7 +22,7 @@ "magento/module-require-js": "*", "magento/module-media-storage": "*", "php": "~8.2.0||~8.3.0||~8.4.0", - "phpgt/dom": "dev-php84-support" + "phpgt/dom": "dev-master" }, "suggest": { "magento/module-review": "*" From be4437901990eb6c36d5713c713d993387a05a36 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Mon, 23 Dec 2024 21:12:41 +0530 Subject: [PATCH 07/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- .../Block/Adminhtml/Stage/Render.php | 9 ++------- .../PageBuilder/Block/WysiwygSetup.php | 4 ++-- .../Component/Form/Element/Wysiwyg.php | 4 ++-- .../PageBuilder/Component/Form/HtmlCode.php | 6 +++--- .../Adminhtml/ContentType/Image/Upload.php | 8 ++++---- .../Model/Catalog/Sorting/SimpleOption.php | 4 ++-- .../Model/Dom/Adapter/DocumentInterface.php | 4 ++-- .../PageBuilder/Model/Dom/Document.php | 4 ++-- .../Template/Grid/Collection.php | 4 ++-- .../PageBuilder/Model/Stage/Config.php | 20 +++++++++---------- 10 files changed, 31 insertions(+), 36 deletions(-) diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php index dbd20013ce3..93ed889699c 100644 --- a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php +++ b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php @@ -1,7 +1,7 @@ Date: Mon, 23 Dec 2024 21:14:52 +0530 Subject: [PATCH 08/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- .../Magento/PageBuilder/Block/Adminhtml/Stage/Render.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php index 93ed889699c..0ca7a999e9e 100644 --- a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php +++ b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php @@ -15,6 +15,11 @@ use Magento\PageBuilder\Model\Stage\Config; use Magento\Framework\Serialize\Serializer\Json; +/** + * Class Render + * + * @api + */ class Render extends Template { /** From 1c3070a49fe6c916f80cc266c551d6900f4334af Mon Sep 17 00:00:00 2001 From: Bhavin Parmar Date: Tue, 31 Dec 2024 12:08:55 +0530 Subject: [PATCH 09/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- .../Magento/PageBuilder/Block/Adminhtml/Stage/Render.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php index 0ca7a999e9e..93ed889699c 100644 --- a/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php +++ b/app/code/Magento/PageBuilder/Block/Adminhtml/Stage/Render.php @@ -15,11 +15,6 @@ use Magento\PageBuilder\Model\Stage\Config; use Magento\Framework\Serialize\Serializer\Json; -/** - * Class Render - * - * @api - */ class Render extends Template { /** From c3e85c6873e12e57b2a806105580855f1e7f9e24 Mon Sep 17 00:00:00 2001 From: Dnyaneshwar Jambhulkar Date: Fri, 3 Jan 2025 12:29:29 +0530 Subject: [PATCH 10/13] phpgt/dom version updated to support PHP8.4 --- app/code/Magento/PageBuilder/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/PageBuilder/composer.json b/app/code/Magento/PageBuilder/composer.json index 865a08e8868..0f2a99d7887 100644 --- a/app/code/Magento/PageBuilder/composer.json +++ b/app/code/Magento/PageBuilder/composer.json @@ -22,7 +22,7 @@ "magento/module-require-js": "*", "magento/module-media-storage": "*", "php": "~8.2.0||~8.3.0||~8.4.0", - "phpgt/dom": "dev-master" + "phpgt/dom": "^4.1" }, "suggest": { "magento/module-review": "*" From ccde1991a94b17e1728949181e66e2d848055b55 Mon Sep 17 00:00:00 2001 From: Saurabh Kumar Date: Fri, 3 Jan 2025 14:56:07 +0530 Subject: [PATCH 11/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- .../view/adminhtml/layout/pagebuilder_stage_render.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml b/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml index c4000587063..6209039dbda 100644 --- a/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml +++ b/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml @@ -24,6 +24,7 @@ + From a669cb18177a9464c50c7fbf5f7d629ac22faa4d Mon Sep 17 00:00:00 2001 From: Dnyaneshwar Jambhulkar Date: Fri, 3 Jan 2025 19:12:45 +0530 Subject: [PATCH 12/13] PHP 8.4 deprecations require Adobe Commerce breaking changes --- .../layout/pagebuilder_stage_render.xml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml b/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml index 6209039dbda..917ae0acf75 100644 --- a/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml +++ b/app/code/Magento/PageBuilder/view/adminhtml/layout/pagebuilder_stage_render.xml @@ -1,11 +1,12 @@ - + @@ -24,9 +25,11 @@ - - - + + From 5b47747d37760934a59caf44d5a063b3e9e73638 Mon Sep 17 00:00:00 2001 From: Rajesh Kumar Date: Sat, 11 Jan 2025 02:32:31 +0530 Subject: [PATCH 13/13] AC-13306::Adobe Commerce 2.4.8 core code is compatible with PHP 8.4 --- app/code/Magento/PageBuilder/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/PageBuilder/composer.json b/app/code/Magento/PageBuilder/composer.json index 865a08e8868..0f2a99d7887 100644 --- a/app/code/Magento/PageBuilder/composer.json +++ b/app/code/Magento/PageBuilder/composer.json @@ -22,7 +22,7 @@ "magento/module-require-js": "*", "magento/module-media-storage": "*", "php": "~8.2.0||~8.3.0||~8.4.0", - "phpgt/dom": "dev-master" + "phpgt/dom": "^4.1" }, "suggest": { "magento/module-review": "*"