Merge branch '2.4-develop' of https://github.com/mage-os/mirror-magento2

 into 2.4-develop

app/code/Magento/AdminAnalytics/ViewModel/Metadata.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);
@@ -65,7 +65,7 @@ public function __construct(
         Session $authSession,
         State $appState,
         ScopeConfigInterface $config,
-        CspNonceProvider $nonceProvider = null
+        ?CspNonceProvider $nonceProvider = null
     ) {
         $this->productMetadata = $productMetadata;
         $this->authSession = $authSession;

app/code/Magento/AdminAnalytics/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-backend": "*",
         "magento/module-config": "*",

app/code/Magento/AdminNotification/Model/Feed.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\AdminNotification\Model;
 
@@ -107,10 +107,10 @@ public function __construct(
         DeploymentConfig $deploymentConfig,
         ProductMetadataInterface $productMetadata,
         UrlInterface $urlBuilder,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = [],
-        Escaper $escaper = null
+        ?Escaper $escaper = null
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
         $this->_backendConfig = $backendConfig;

app/code/Magento/AdminNotification/Model/ResourceModel/System/Message/Collection.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\AdminNotification\Model\ResourceModel\System\Message;
 
@@ -40,8 +40,8 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db\FetchStrategyInterface $fetchStrategy,
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Framework\Notification\MessageList $messageList,
-        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
-        \Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
+        ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+        ?\Magento\Framework\Model\ResourceModel\Db\AbstractDb $resource = null
     ) {
         $this->_messageList = $messageList;
         parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $connection, $resource);

app/code/Magento/AdminNotification/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "lib-libxml": "*",
         "magento/framework": "*",
         "magento/module-backend": "*",

app/code/Magento/AdvancedPricingImportExport/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-catalog": "*",
         "magento/module-catalog-import-export": "*",

app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\AdvancedSearch\Model\ResourceModel;
 
@@ -67,8 +67,8 @@ public function __construct(
         StoreManagerInterface $storeManager,
         MetadataPool $metadataPool,
         $connectionName = null,
-        TableResolver $tableResolver = null,
-        DimensionCollectionFactory $dimensionCollectionFactory = null
+        ?TableResolver $tableResolver = null,
+        ?DimensionCollectionFactory $dimensionCollectionFactory = null
     ) {
         parent::__construct($context, $connectionName);
         $this->storeManager = $storeManager;

app/code/Magento/AdvancedSearch/Model/ResourceModel/Search/Grid/Collection.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\AdvancedSearch\Model\ResourceModel\Search\Grid;
 
@@ -12,8 +12,6 @@
 class Collection extends \Magento\Search\Model\ResourceModel\Query\Collection
 {
     /**
-     * Registry manager
-     *
      * @var \Magento\Framework\Registry
      */
     protected $_registryManager;
@@ -37,7 +35,7 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\DB\Helper $resourceHelper,
         \Magento\Framework\Registry $registry,
-        \Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
+        ?\Magento\Framework\DB\Adapter\AdapterInterface $connection = null,
         $resource = null
     ) {
         $this->_registryManager = $registry;

app/code/Magento/AdvancedSearch/composer.json

@@ -13,7 +13,7 @@
         "magento/module-customer": "*",
         "magento/module-search": "*",
         "magento/module-store": "*",
-        "php": "~8.2.0||~8.3.0"
+        "php": "~8.2.0||~8.3.0||~8.4.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Amqp/Setup/ConnectionValidator.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Amqp\Setup;
 
@@ -45,7 +45,7 @@ public function isConnectionValid(
         $password = '',
         $virtualHost = '',
         bool $ssl = false,
-        array $sslOptions = null
+        ?array $sslOptions = null
     ) {
         try {
             $options = new FactoryOptions();

app/code/Magento/Amqp/composer.json

@@ -8,7 +8,7 @@
         "magento/framework": "*",
         "magento/framework-amqp": "*",
         "magento/framework-message-queue": "*",
-        "php": "~8.2.0||~8.3.0"
+        "php": "~8.2.0||~8.3.0||~8.4.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Analytics/Model/Config/Backend/CollectionTime.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\Analytics\Model\Config\Backend;
 
@@ -23,7 +23,7 @@ class CollectionTime extends Value
     /**
      * The path to config setting of schedule of collection data cron.
      */
-    const CRON_SCHEDULE_PATH = 'crontab/default/jobs/analytics_collect_data/schedule/cron_expr';
+    public const CRON_SCHEDULE_PATH = 'crontab/default/jobs/analytics_collect_data/schedule/cron_expr';
 
     /**
      * @var WriterInterface
@@ -46,16 +46,16 @@ public function __construct(
         ScopeConfigInterface $config,
         TypeListInterface $cacheTypeList,
         WriterInterface $configWriter,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->configWriter = $configWriter;
         parent::__construct($context, $registry, $config, $cacheTypeList, $resource, $resourceCollection, $data);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * {@inheritdoc}. Set schedule setting for cron.
      *

app/code/Magento/Analytics/Model/Config/Backend/Enabled.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\Analytics\Model\Config\Backend;
 
@@ -23,7 +23,7 @@ class Enabled extends Value
     /**
      * Path to field subscription enabled into config structure.
      */
-    const XML_ENABLED_CONFIG_STRUCTURE_PATH = 'analytics/general/enabled';
+    public const XML_ENABLED_CONFIG_STRUCTURE_PATH = 'analytics/general/enabled';
 
     /**
      * Service for processing of activation/deactivation MBI subscription.
@@ -48,8 +48,8 @@ public function __construct(
         ScopeConfigInterface $config,
         TypeListInterface $cacheTypeList,
         SubscriptionHandler $subscriptionHandler,
-        AbstractResource $resource = null,
-        AbstractDb $resourceCollection = null,
+        ?AbstractResource $resource = null,
+        ?AbstractDb $resourceCollection = null,
         array $data = []
     ) {
         $this->subscriptionHandler = $subscriptionHandler;

app/code/Magento/Analytics/ReportXml/DB/ReportValidator.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\Analytics\ReportXml\DB;
 
@@ -46,7 +46,7 @@ public function __construct(ConnectionFactory $connectionFactory, QueryFactory $
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
-    public function validate($name, SearchCriteriaInterface $criteria = null)
+    public function validate($name, ?SearchCriteriaInterface $criteria = null)
     {
         $query = $this->queryFactory->create($name);
         $connection = $this->connectionFactory->getConnection($query->getConnectionName());

app/code/Magento/Analytics/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-analytics",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/module-backend": "*",
         "magento/module-config": "*",
         "magento/module-integration": "*",

app/code/Magento/ApplicationPerformanceMonitor/composer.json

@@ -12,7 +12,7 @@
     }
   },
   "require": {
-    "php": "~8.2.0||~8.3.0",
+    "php": "~8.2.0||~8.3.0||~8.4.0",
     "magento/framework": "*"
   }
 }

app/code/Magento/ApplicationPerformanceMonitorNewRelic/composer.json

@@ -12,7 +12,7 @@
     }
   },
   "require": {
-    "php": "~8.2.0||~8.3.0",
+    "php": "~8.2.0||~8.3.0||~8.4.0",
     "magento/framework": "*",
     "magento/module-application-performance-monitor": "*",
     "magento/module-new-relic-reporting": "*"

app/code/Magento/AsyncConfig/composer.json

@@ -2,7 +2,7 @@
     "name": "magento/module-async-config",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-config": "*"
     },

app/code/Magento/AsynchronousOperations/composer.json

@@ -11,7 +11,7 @@
         "magento/module-authorization": "*",
         "magento/module-backend": "*",
         "magento/module-ui": "*",
-        "php": "~8.2.0||~8.3.0"
+        "php": "~8.2.0||~8.3.0||~8.4.0"
     },
     "suggest": {
         "magento/module-admin-notification": "*",

app/code/Magento/Authorization/composer.json

@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-backend": "*"
     },

app/code/Magento/AwsS3/Driver/AwsS3.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -74,7 +74,7 @@ public function __construct(
         FilesystemAdapter $adapter,
         LoggerInterface $logger,
         string $objectUrl,
-        MetadataProviderInterface $metadataProvider = null
+        ?MetadataProviderInterface $metadataProvider = null
     ) {
         $this->adapter = $adapter;
         $this->logger = $logger;
@@ -207,7 +207,7 @@ private function createDirectoryRecursively(string $path): bool
     /**
      * @inheritDoc
      */
-    public function copy($source, $destination, DriverInterface $targetDriver = null): bool
+    public function copy($source, $destination, ?DriverInterface $targetDriver = null): bool
     {
         try {
             $this->adapter->copy(
@@ -526,7 +526,7 @@ public function getRealPath($path)
     /**
      * @inheritDoc
      */
-    public function rename($oldPath, $newPath, DriverInterface $targetDriver = null): bool
+    public function rename($oldPath, $newPath, ?DriverInterface $targetDriver = null): bool
     {
         if ($oldPath === $newPath) {
             return true;
@@ -636,7 +636,7 @@ private function glob(string $pattern): Generator
     /**
      * @inheritDoc
      */
-    public function symlink($source, $destination, DriverInterface $targetDriver = null): bool
+    public function symlink($source, $destination, ?DriverInterface $targetDriver = null): bool
     {
         return $this->copy($source, $destination, $targetDriver);
     }
@@ -777,7 +777,7 @@ public function endOfFile($resource): bool
     public function filePutCsv($resource, array $data, $delimiter = ',', $enclosure = '"')
     {
         //phpcs:ignore Magento2.Functions.DiscouragedFunction
-        return fputcsv($resource, $data, $delimiter, $enclosure);
+        return fputcsv($resource, $data, $delimiter, $enclosure, '\\');
     }
 
     /**