Merge branch '2.4-develop' into fix-for-issue-35670

Author: engcom-Hotel

app/code/Magento/AdminAnalytics/composer.json

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

app/code/Magento/AdminNotification/composer.json

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

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing/Validator/TierPrice.php

@@ -61,7 +61,10 @@ public function __construct(
     public function init($context)
     {
         foreach ($this->groupRepository->getList($this->searchCriteriaBuilder->create())->getItems() as $group) {
-            $this->customerGroups[$group->getCode()] = $group->getId();
+            $code = $group->getCode();
+            if ($code !== null) {
+                $this->customerGroups[$code] = $group->getId();
+            }
         }
         $this->context = $context;
     }

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php

@@ -240,26 +240,23 @@ protected function setUp(): void
             AdvancedPricing::class,
             array_merge($mockAddMethods, $mockMethods)
         );
-        
+
         // Configure constructor methods to return self
         foreach ($constructorMethods as $method) {
             $this->advancedPricing->method($method)->willReturnSelf();
         }
-        
+
         // Set properties directly using reflection instead of calling constructor
         // to avoid parent constructor that needs ObjectManager
         $reflection = new \ReflectionClass($this->advancedPricing);
-        
+
         $storeResolverProperty = $reflection->getProperty('_storeResolver');
-        $storeResolverProperty->setAccessible(true);
         $storeResolverProperty->setValue($this->advancedPricing, $this->storeResolver);
-        
+
         $groupRepositoryProperty = $reflection->getProperty('_groupRepository');
-        $groupRepositoryProperty->setAccessible(true);
         $groupRepositoryProperty->setValue($this->advancedPricing, $this->groupRepository);
-        
+
         $resourceProperty = $reflection->getProperty('_resource');
-        $resourceProperty->setAccessible(true);
         $resourceProperty->setValue($this->advancedPricing, $this->resource);
     }
 
@@ -371,7 +368,6 @@ protected function getPropertyValue($object, $property)
     {
         $reflection = new \ReflectionClass(get_class($object));
         $reflectionProperty = $reflection->getProperty($property);
-        $reflectionProperty->setAccessible(true);
         return $reflectionProperty->getValue($object);
     }
 
@@ -388,7 +384,6 @@ protected function setPropertyValue(&$object, $property, $value)
     {
         $reflection = new \ReflectionClass(get_class($object));
         $reflectionProperty = $reflection->getProperty($property);
-        $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($object, $value);
         return $object;
     }

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php

@@ -125,7 +125,6 @@ public function testInitAddToCustomerGroups()
 
         $reflection = new ReflectionClass($this->tierPrice);
         $property = $reflection->getProperty('customerGroups');
-        $property->setAccessible(true);
         $this->assertEquals($expectedCustomerGroups, $property->getValue($this->tierPrice));
     }
 

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -1070,7 +1070,6 @@ protected function getPropertyValue($object, $property)
     {
         $reflection = new \ReflectionClass(get_class($object));
         $reflectionProperty = $reflection->getProperty($property);
-        $reflectionProperty->setAccessible(true);
 
         return $reflectionProperty->getValue($object);
     }
@@ -1089,7 +1088,6 @@ protected function setPropertyValue(&$object, $property, $value)
     {
         $reflection = new \ReflectionClass(get_class($object));
         $reflectionProperty = $reflection->getProperty($property);
-        $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($object, $value);
 
         return $object;
@@ -1109,7 +1107,6 @@ private function invokeMethod($object, $method, $args = [])
     {
         $class = new \ReflectionClass(AdvancedPricing::class);
         $method = $class->getMethod($method);
-        $method->setAccessible(true);
 
         return $method->invokeArgs($object, $args);
     }
@@ -1158,7 +1155,6 @@ private function getAdvancedPricingMock(array $methods = []): MockObject
         );
         $reflection = new \ReflectionClass(AdvancedPricing::class);
         $reflectionProperty = $reflection->getProperty('metadataPool');
-        $reflectionProperty->setAccessible(true);
         $reflectionProperty->setValue($advancedPricingMock, $metadataPoolMock);
 
         return $advancedPricingMock;

app/code/Magento/AdvancedPricingImportExport/composer.json

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

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||~8.4.0"
+        "php": "~8.3.0||~8.4.0||~8.5.0"
     },
     "type": "magento2-module",
     "license": [

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||~8.4.0"
+        "php": "~8.3.0||~8.4.0||~8.5.0"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php

@@ -52,7 +52,6 @@ protected function setUp(): void
         $escaper = $objectManager->getObject(Escaper::class);
         $reflection = new \ReflectionClass($this->abstractElementMock);
         $reflection_property = $reflection->getProperty('_escaper');
-        $reflection_property->setAccessible(true);
         $reflection_property->setValue($this->abstractElementMock, $escaper);
 
         $this->abstractElementMock->setEscaper($escaper);