Merge pull request #69 from magento-cia/cia-2.4.8-beta2-develop-2.4-develop-sync-01142025

pawan-adobe-security · web-flow · commit 76430af1c496 · 2025-01-16T00:05:43.000+05:30
Cia 2.4.8 beta2 develop 2.4 develop sync 01142025
diff --git a/app/code/Magento/BundleSampleData/Setup/Installer.php b/app/code/Magento/BundleSampleData/Setup/Installer.php
@@ -32,7 +32,7 @@ class Installer implements Setup\SampleData\InstallerInterface
      */
     public function __construct(
         \Magento\BundleSampleData\Model\Product $bundleProduct,
-        StoreManagerInterface $storeManager = null
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->bundleProduct = $bundleProduct;
         $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
diff --git a/app/code/Magento/BundleSampleData/composer.json b/app/code/Magento/BundleSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-bundle-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog-sample-data": "*",
diff --git a/app/code/Magento/CatalogRuleSampleData/Model/Rule.php b/app/code/Magento/CatalogRuleSampleData/Model/Rule.php
@@ -72,7 +72,7 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryCollectionFactory,
         \Magento\Customer\Model\GroupFactory $groupFactory,
         \Magento\Store\Model\WebsiteFactory $websiteFactory,
-        Json $serializer = null
+        ?Json $serializer = null
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
@@ -128,7 +128,7 @@ public function convertSerializedData($data)
         preg_match_all($regexp, $data, $matches);
         $replacement = null;
         foreach ($matches[1] as $matchedId => $matchedItem) {
-            $extractedData = array_filter(explode(",", $matchedItem));
+            $extractedData = array_filter(explode(",", $matchedItem ?? ''));
             foreach ($extractedData as $extractedItem) {
                 $separatedData = array_filter(explode('=', $extractedItem));
                 if ($separatedData[0] == 'url_key') {
diff --git a/app/code/Magento/CatalogRuleSampleData/composer.json b/app/code/Magento/CatalogRuleSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-rule-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-catalog-rule": "*",
         "magento/module-store": "*",
diff --git a/app/code/Magento/CatalogSampleData/Model/Attribute.php b/app/code/Magento/CatalogSampleData/Model/Attribute.php
@@ -108,7 +108,7 @@ public function install(array $fixtures)
             foreach ($rows as $row) {
                 $data = [];
                 foreach ($row as $key => $value) {
-                    $data[$header[$key]] = trim($value);
+                    $data[$header[$key]] = trim($value ?? '');
                 }
                 $data['attribute_set'] = explode("\n", $data['attribute_set']);
 
@@ -144,7 +144,7 @@ public function install(array $fixtures)
 
                 if (is_array($data['attribute_set'])) {
                     foreach ($data['attribute_set'] as $setName) {
-                        $setName = trim($setName);
+                        $setName = trim($setName ?? '');
                         $attributeCount++;
                         $attributeSet = $this->processAttributeSet($setName);
                         $attributeGroupId = $attributeSet->getDefaultGroupId();
@@ -171,7 +171,7 @@ public function install(array $fixtures)
     protected function getOption($attribute, $data)
     {
         $result = [];
-        $data['option'] = explode("\n", $data['option']);
+        $data['option'] = explode("\n", $data['option'] ?? '');
         /** @var \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\Collection $options */
         $options = $this->attrOptionCollectionFactory->create()
             ->setAttributeFilter($attribute->getId())
diff --git a/app/code/Magento/CatalogSampleData/Model/Product/Converter.php b/app/code/Magento/CatalogSampleData/Model/Product/Converter.php
@@ -165,7 +165,7 @@ protected function getArrayValue($value)
         if (is_array($value)) {
             return $value;
         }
-        if (false !== strpos($value, "\n")) {
+        if ($value !== null && false !== strpos($value, "\n")) {
             $value = array_filter(explode("\n", $value));
         }
         return !is_array($value) ? [$value] : $value;
diff --git a/app/code/Magento/CatalogSampleData/composer.json b/app/code/Magento/CatalogSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-catalog-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-eav": "*",
diff --git a/app/code/Magento/CmsSampleData/composer.json b/app/code/Magento/CmsSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-cms-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-cms": "*",
         "magento/module-theme-sample-data": "*",
diff --git a/app/code/Magento/ConfigurableSampleData/Model/Product/Converter.php b/app/code/Magento/ConfigurableSampleData/Model/Product/Converter.php
@@ -139,7 +139,7 @@ protected function convertAttributeValues($valuesData)
         $values = [];
         $prices = [];
         foreach ($valuesData as $item) {
-            $itemData = explode(';', $item);
+            $itemData = explode(';', $item ?? '');
             if (!empty($itemData[0])) {
                 $values[] = $itemData[0];
             }
diff --git a/app/code/Magento/ConfigurableSampleData/composer.json b/app/code/Magento/ConfigurableSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-configurable-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-configurable-product": "*",
         "magento/module-product-links-sample-data": "*",
diff --git a/app/code/Magento/CustomerSampleData/composer.json b/app/code/Magento/CustomerSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-customer-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-directory": "*",
diff --git a/app/code/Magento/DownloadableSampleData/Model/Product/Converter.php b/app/code/Magento/DownloadableSampleData/Model/Product/Converter.php
@@ -32,8 +32,8 @@ public function __construct(
         \Magento\Catalog\Model\ResourceModel\Product\Attribute\CollectionFactory $attributeCollectionFactory,
         \Magento\Eav\Model\ResourceModel\Entity\Attribute\Option\CollectionFactory $attrOptionCollectionFactory,
         \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $productCollectionFactory,
-        \Magento\Downloadable\Api\Data\File\ContentInterfaceFactory $fileContentFactory = null,
-        Filesystem $filesystem = null
+        ?\Magento\Downloadable\Api\Data\File\ContentInterfaceFactory $fileContentFactory = null,
+        ?Filesystem $filesystem = null
     ) {
         parent::__construct(
             $categoryTreeFactory,
diff --git a/app/code/Magento/DownloadableSampleData/Setup/Installer.php b/app/code/Magento/DownloadableSampleData/Setup/Installer.php
@@ -44,7 +44,7 @@ public function __construct(
         Category $category,
         Attribute $attribute,
         Product $product,
-        StoreManagerInterface $storeManager = null
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->category = $category;
         $this->attribute = $attribute;
diff --git a/app/code/Magento/DownloadableSampleData/composer.json b/app/code/Magento/DownloadableSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-downloadable-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-catalog-sample-data": "*",
         "magento/module-downloadable": "*",
diff --git a/app/code/Magento/GroupedProductSampleData/Setup/Installer.php b/app/code/Magento/GroupedProductSampleData/Setup/Installer.php
@@ -29,7 +29,7 @@ class Installer implements Setup\SampleData\InstallerInterface
      */
     public function __construct(
         \Magento\GroupedProductSampleData\Model\Product $groupedProduct,
-        StoreManagerInterface $storeManager = null
+        ?StoreManagerInterface $storeManager = null
     ) {
         $this->groupedProduct = $groupedProduct;
         $this->storeManager = $storeManager ?: \Magento\Framework\App\ObjectManager::getInstance()
diff --git a/app/code/Magento/GroupedProductSampleData/composer.json b/app/code/Magento/GroupedProductSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-grouped-product-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-catalog-sample-data": "*",
         "magento/module-grouped-product": "*",
diff --git a/app/code/Magento/MsrpSampleData/composer.json b/app/code/Magento/MsrpSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-msrp-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-msrp": "*",
         "magento/module-customer": "*",
diff --git a/app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php b/app/code/Magento/OfflineShippingSampleData/Model/Tablerate.php
@@ -83,7 +83,7 @@ public function __construct(
         \Magento\Framework\App\Cache\TypeListInterface $cacheTypeList,
         \Magento\Framework\App\Config\Storage\WriterInterface $configWriter,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
-        SystemConfig $systemConfig = null
+        ?SystemConfig $systemConfig = null
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
diff --git a/app/code/Magento/OfflineShippingSampleData/composer.json b/app/code/Magento/OfflineShippingSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-offline-shipping-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-offline-shipping": "*",
         "magento/module-directory": "*",
diff --git a/app/code/Magento/ProductLinksSampleData/composer.json b/app/code/Magento/ProductLinksSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-product-links-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-catalog": "*"
     },
diff --git a/app/code/Magento/ReviewSampleData/composer.json b/app/code/Magento/ReviewSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-review-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-review": "*",
         "magento/module-customer": "*",
diff --git a/app/code/Magento/SalesRuleSampleData/composer.json b/app/code/Magento/SalesRuleSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sales-rule-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-catalog-rule-sample-data": "*",
         "magento/module-sales-rule": "*",
diff --git a/app/code/Magento/SalesSampleData/Model/Order/Converter.php b/app/code/Magento/SalesSampleData/Model/Order/Converter.php
@@ -56,7 +56,7 @@ public function __construct(
         \Magento\Catalog\Model\ProductFactory $productFactory,
         \Magento\ConfigurableSampleData\Model\Product\ConverterFactory $productConverterFactory,
         \Magento\Eav\Model\Config $eavConfig,
-        Json $serializer = null
+        ?Json $serializer = null
     ) {
         $this->customerRepository = $customerAccount;
         $this->productFactory = $productFactory;
diff --git a/app/code/Magento/SalesSampleData/composer.json b/app/code/Magento/SalesSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-sales-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-sales": "*",
         "magento/module-configurable-sample-data": "*",
diff --git a/app/code/Magento/SwatchesSampleData/Model/Swatches.php b/app/code/Magento/SwatchesSampleData/Model/Swatches.php
@@ -126,7 +126,8 @@ private function getOptionSwatchVisual(array $attributeData)
     {
         $optionSwatch = ['value' => []];
         foreach ($attributeData['option'] as $optionKey => $optionValue) {
-            if (substr($optionValue, 0, 1) == '#' && strlen($optionValue) == 7) {
+            if ($optionValue !== null && substr($optionValue, 0, 1) == '#'
+                && strlen($optionValue) == 7) {
                 $optionSwatch['value'][$optionKey] = $optionValue;
             } else if (!empty($this->colorMap[$optionValue])) {
                 $optionSwatch['value'][$optionKey] = $this->colorMap[$optionValue];
diff --git a/app/code/Magento/SwatchesSampleData/composer.json b/app/code/Magento/SwatchesSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-swatches-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-eav": "*",
         "magento/module-catalog": "*"
diff --git a/app/code/Magento/TaxSampleData/Model/Tax.php b/app/code/Magento/TaxSampleData/Model/Tax.php
@@ -87,7 +87,7 @@ public function __construct(
         \Magento\Tax\Model\Calculation\RateFactory $taxRateFactory,
         \Magento\Framework\Api\SearchCriteriaBuilder $criteriaBuilder,
         \Magento\Framework\Api\FilterBuilder $filterBuilder,
-        \Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory = null
+        ?\Magento\Directory\Model\ResourceModel\Region\CollectionFactory $regionCollectionFactory = null
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
diff --git a/app/code/Magento/TaxSampleData/composer.json b/app/code/Magento/TaxSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-tax-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-tax": "*",
         "magento/module-directory": "*"
diff --git a/app/code/Magento/ThemeSampleData/Model/HeadStyle.php b/app/code/Magento/ThemeSampleData/Model/HeadStyle.php
@@ -57,7 +57,8 @@ public function __construct(
 
     public function add($contentFile, $cssFile)
     {
-        $styleContent = preg_replace('/^\/\*[\s\S]+\*\//', '', file_get_contents($contentFile));
+        $styleContent = preg_replace('/^\/\*[\s\S]+\*\//', '',
+            file_get_contents($contentFile ?? ''));
         if (empty($styleContent)) {
             return;
         }
diff --git a/app/code/Magento/ThemeSampleData/composer.json b/app/code/Magento/ThemeSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-theme-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-theme": "*",
         "magento/module-store": "*"
diff --git a/app/code/Magento/WidgetSampleData/Model/CmsBlock.php b/app/code/Magento/WidgetSampleData/Model/CmsBlock.php
@@ -76,8 +76,8 @@ public function __construct(
         \Magento\Cms\Model\BlockFactory $cmsBlockFactory,
         \Magento\Widget\Model\ResourceModel\Widget\Instance\CollectionFactory $appCollectionFactory,
         \Magento\Catalog\Model\ResourceModel\Category\CollectionFactory $categoryFactory,
-        Json $serializer = null,
-        State $appState = null
+        ?Json $serializer = null,
+        ?State $appState = null
     ) {
         $this->fixtureManager = $sampleDataContext->getFixtureManager();
         $this->csvReader = $sampleDataContext->getCsvReader();
diff --git a/app/code/Magento/WidgetSampleData/composer.json b/app/code/Magento/WidgetSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-widget-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-widget": "*",
         "magento/module-theme": "*",
diff --git a/app/code/Magento/WishlistSampleData/Model/Wishlist.php b/app/code/Magento/WishlistSampleData/Model/Wishlist.php
@@ -80,7 +80,7 @@ public function install(array $fixtures)
                 if (!$wishlist->getId()) {
                     continue;
                 }
-                $productSkuList = explode("\n", $row['product_list']);
+                $productSkuList = explode("\n", $row['product_list'] ?? '');
                 $this->helper->addProductsToWishlist($wishlist, $productSkuList);
             }
         }
diff --git a/app/code/Magento/WishlistSampleData/composer.json b/app/code/Magento/WishlistSampleData/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-wishlist-sample-data",
     "description": "N/A",
     "require": {
-        "php": "~8.1.0||~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-wishlist": "*",
         "magento/module-customer": "*",

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ protected function getArrayValue($value)`
`165`	`165`	`if (is_array($value)) {`
`166`	`166`	`return $value;`
`167`	`167`	`}`
`168`		`- if (false !== strpos($value, "\n")) {`
	`168`	`+ if ($value !== null && false !== strpos($value, "\n")) {`
`169`	`169`	`$value = array_filter(explode("\n", $value));`
`170`	`170`	`}`
`171`	`171`	`return !is_array($value) ? [$value] : $value;`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ protected function convertAttributeValues($valuesData)`
`139`	`139`	`$values = [];`
`140`	`140`	`$prices = [];`
`141`	`141`	`foreach ($valuesData as $item) {`
`142`		`- $itemData = explode(';', $item);`
	`142`	`+ $itemData = explode(';', $item ?? '');`
`143`	`143`	`if (!empty($itemData[0])) {`
`144`	`144`	`$values[] = $itemData[0];`
`145`	`145`	`}`