Merge branch '2.4-develop' into LYNX-311-DELIVERY

magento · Jan 17, 2024 · ad7dfa8 · ad7dfa8
2 parents 0e33602 + 03621bb
commit ad7dfa8
Show file tree

Hide file tree

Showing 250 changed files with 1,011 additions and 1,137 deletions.
diff --git a/app/code/Magento/AdminAnalytics/composer.json b/app/code/Magento/AdminAnalytics/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-config": "*",

diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "lib-libxml": "*",
  "magento/framework": "*",
  "magento/module-backend": "*",

diff --git a/app/code/Magento/AdvancedPricingImportExport/composer.json b/app/code/Magento/AdvancedPricingImportExport/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-catalog": "*",
  "magento/module-catalog-import-export": "*",

diff --git a/app/code/Magento/AdvancedSearch/composer.json b/app/code/Magento/AdvancedSearch/composer.json
@@ -13,7 +13,7 @@
  "magento/module-customer": "*",
  "magento/module-search": "*",
  "magento/module-store": "*",
- "php": "~8.1.0||~8.2.0"
+ "php": "~8.1.0||~8.2.0||~8.3.0"
  },
  "type": "magento2-module",
  "license": [

diff --git a/app/code/Magento/Amqp/composer.json b/app/code/Magento/Amqp/composer.json
@@ -8,7 +8,7 @@
  "magento/framework": "*",
  "magento/framework-amqp": "*",
  "magento/framework-message-queue": "*",
- "php": "~8.1.0||~8.2.0"
+ "php": "~8.1.0||~8.2.0||~8.3.0"
  },
  "type": "magento2-module",
  "license": [

diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
@@ -2,7 +2,7 @@
  "name": "magento/module-analytics",
  "description": "N/A",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/module-backend": "*",
  "magento/module-config": "*",
  "magento/module-integration": "*",

diff --git a/app/code/Magento/ApplicationPerformanceMonitor/composer.json b/app/code/Magento/ApplicationPerformanceMonitor/composer.json
@@ -12,7 +12,7 @@
  }
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*"
  }
 }
diff --git a/app/code/Magento/ApplicationPerformanceMonitorNewRelic/composer.json b/app/code/Magento/ApplicationPerformanceMonitorNewRelic/composer.json
@@ -12,7 +12,7 @@
  }
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-application-performance-monitor": "*",
  "magento/module-new-relic-reporting": "*"

diff --git a/app/code/Magento/AsyncConfig/composer.json b/app/code/Magento/AsyncConfig/composer.json
@@ -2,7 +2,7 @@
  "name": "magento/module-async-config",
  "description": "N/A",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-config": "*"
  },

diff --git a/app/code/Magento/AsynchronousOperations/composer.json b/app/code/Magento/AsynchronousOperations/composer.json
@@ -11,7 +11,7 @@
  "magento/module-authorization": "*",
  "magento/module-backend": "*",
  "magento/module-ui": "*",
- "php": "~8.1.0||~8.2.0"
+ "php": "~8.1.0||~8.2.0||~8.3.0"
  },
  "suggest": {
  "magento/module-admin-notification": "*",

diff --git a/app/code/Magento/Authorization/composer.json b/app/code/Magento/Authorization/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*"
  },

diff --git a/app/code/Magento/AwsS3/composer.json b/app/code/Magento/AwsS3/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-remote-storage": "*"
  },

diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backup": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-cron": "*",

diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/BundleGraphQl/composer.json b/app/code/Magento/BundleGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/module-catalog": "*",
  "magento/module-bundle": "*",
  "magento/module-graph-ql": "*",

diff --git a/app/code/Magento/BundleImportExport/composer.json b/app/code/Magento/BundleImportExport/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-bundle": "*",
  "magento/module-store": "*",

diff --git a/app/code/Magento/CacheInvalidate/composer.json b/app/code/Magento/CacheInvalidate/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-page-cache": "*"
  },

diff --git a/app/code/Magento/Captcha/composer.json b/app/code/Magento/Captcha/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-checkout": "*",

diff --git a/app/code/Magento/CardinalCommerce/composer.json b/app/code/Magento/CardinalCommerce/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-checkout": "*",
  "magento/module-payment": "*",

diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Category.php b/app/code/Magento/Catalog/Model/ResourceModel/Category.php
@@ -1055,7 +1055,7 @@ protected function _processPositions($category, $newParent, $afterCategoryId)
  if ($afterCategoryId) {
  $select = $connection->select()->from($table, 'position')->where('entity_id = :entity_id');
  $position = $connection->fetchOne($select, ['entity_id' => $afterCategoryId]);
- $position++;
+ $position = (int)$position + 1;
  } else {
  $position = 1;
  }

diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/framework-bulk": "*",
  "magento/module-authorization": "*",

diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
@@ -2,7 +2,7 @@
  "name": "magento/module-catalog-analytics",
  "description": "N/A",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-catalog": "*",
  "magento/module-analytics": "*"

diff --git a/app/code/Magento/CatalogCmsGraphQl/composer.json b/app/code/Magento/CatalogCmsGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-catalog": "*",
  "magento/module-cms-graph-ql": "*"

diff --git a/app/code/Magento/CatalogCustomerGraphQl/composer.json b/app/code/Magento/CatalogCustomerGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-catalog": "*",
  "magento/module-customer": "*",

diff --git a/app/code/Magento/CatalogGraphQl/composer.json b/app/code/Magento/CatalogGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/module-eav": "*",
  "magento/module-catalog": "*",
  "magento/module-catalog-inventory": "*",

diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "ext-ctype": "*",
  "magento/framework": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-catalog": "*",
  "magento/module-config": "*",

diff --git a/app/code/Magento/CatalogInventoryGraphQl/composer.json b/app/code/Magento/CatalogInventoryGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-store": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/CatalogRuleConfigurable/composer.json b/app/code/Magento/CatalogRuleConfigurable/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/magento-composer-installer": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/CatalogRuleGraphQl/composer.json b/app/code/Magento/CatalogRuleGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*"
  },
  "suggest": {

diff --git a/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php b/app/code/Magento/CatalogSearch/Test/Unit/Model/ResourceModel/Fulltext/CollectionTest.php
@@ -167,7 +167,7 @@ protected function tearDown(): void
  {
  $reflectionProperty = new ReflectionProperty(\Magento\Framework\App\ObjectManager::class, '_instance');
  $reflectionProperty->setAccessible(true);
- $reflectionProperty->setValue(null);
+ $reflectionProperty->setValue(null, null);
  }
 
  /**

diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json b/app/code/Magento/CatalogUrlRewriteGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/module-store": "*",
  "magento/module-catalog": "*",
  "magento/module-catalog-graph-ql": "*",

diff --git a/app/code/Magento/CatalogWidget/composer.json b/app/code/Magento/CatalogWidget/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-captcha": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/CheckoutAgreements/composer.json b/app/code/Magento/CheckoutAgreements/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-checkout": "*",

diff --git a/app/code/Magento/CheckoutAgreementsGraphQl/composer.json b/app/code/Magento/CheckoutAgreementsGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-store": "*",
  "magento/module-checkout-agreements": "*"

diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-backend": "*",
  "magento/module-catalog": "*",

diff --git a/app/code/Magento/CmsGraphQl/composer.json b/app/code/Magento/CmsGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-cms": "*",
  "magento/module-widget": "*",

diff --git a/app/code/Magento/CmsUrlRewrite/composer.json b/app/code/Magento/CmsUrlRewrite/composer.json
@@ -5,7 +5,7 @@
  "sort-packages": true
  },
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-cms": "*",
  "magento/module-store": "*",

diff --git a/app/code/Magento/CmsUrlRewriteGraphQl/composer.json b/app/code/Magento/CmsUrlRewriteGraphQl/composer.json
@@ -3,7 +3,7 @@
  "description": "N/A",
  "type": "magento2-module",
  "require": {
- "php": "~8.1.0||~8.2.0",
+ "php": "~8.1.0||~8.2.0||~8.3.0",
  "magento/framework": "*",
  "magento/module-cms": "*",
  "magento/module-store": "*",