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

Author: pawan-adobe-security

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": "*",

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": [

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": [

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -15,11 +15,6 @@
 use Magento\PageBuilder\Model\Stage\Config;
 use Magento\Framework\Serialize\Serializer\Json;
 
-/**
- * Class Render
- *
- * @api
- */
 class Render extends Template
 {
     /**
@@ -56,7 +51,7 @@ public function __construct(
         Config $config,
         Json $json,
         array $data = [],
-        Minification $minification = null
+        ?Minification $minification = null
     ) {
         parent::__construct($context, $data);
         $this->fileManager = $fileManager;

app/code/Magento/PageBuilder/Block/WysiwygSetup.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -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;

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -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);

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\PageBuilder\Component\Form;
@@ -19,7 +19,7 @@
  */
 class HtmlCode extends \Magento\Ui\Component\Form\Field
 {
-    const HTML_ID_PLACEHOLDER = 'HTML_ID_PLACEHOLDER';
+    public const HTML_ID_PLACEHOLDER = 'HTML_ID_PLACEHOLDER';
 
     /**
      * @var BackendUrlInterface
@@ -63,7 +63,7 @@ public function __construct(
         BackendUrlInterface $backendUrl,
         Images $imagesHelper,
         VariableConfig $variableConfig,
-        OpenDialogUrl $openDialogUrl = null,
+        ?OpenDialogUrl $openDialogUrl = null,
         $currentTreePath = 'wysiwyg',
         $components = [],
         array $data = []

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\PageBuilder\Controller\Adminhtml\ContentType\Image;
 
@@ -17,9 +17,9 @@
  */
 class Upload extends \Magento\Backend\App\Action implements HttpPostActionInterface
 {
-    const UPLOAD_DIR = 'wysiwyg';
+    public const UPLOAD_DIR = 'wysiwyg';
 
-    const ADMIN_RESOURCE = 'Magento_Backend::content';
+    public const ADMIN_RESOURCE = 'Magento_Backend::content';
 
     /**
      * @var \Magento\Framework\Filesystem\DirectoryList
@@ -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;

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -20,6 +20,7 @@
  * @deprecated use \Magento\PageBuilder\Controller\Adminhtml\Stage\Preview
  *
  * @api
+ * @see MC-16152
  */
 class Preview extends \Magento\Framework\App\Action\Action implements HttpPostActionInterface
 {
@@ -43,7 +44,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);
 
@@ -70,7 +71,7 @@ public function execute()
 
             return $this->resultFactory->create(ResultFactory::TYPE_JSON)->setData($result);
         }
-
+        // @phpstan-ignore-next-line
         $this->_forward('noroute');
     }
 }

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2019 Adobe
+ * All Rights Reserved.
  */
 
 declare(strict_types=1);
@@ -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;