Merge branch 'main' into phpunit-pre-symfony

Author: sreichel

composer.lock

@@ -90,8 +90,8 @@ public function testEnvOverridesForValidConfigKeys(array $config): void
         $xml = new Varien_Simplexml_Config();
         $xml->loadString($xmlStruct);
 
-        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $loader = new Mage_Core_Helper_EnvironmentConfigLoader();
+        /** @phpstan-ignore method.internal */
         $loader->setEnvStore([
             $config['env_path'] => $config['value'],
         ]);
@@ -197,8 +197,8 @@ public function testEnvDoesNotOverrideForInvalidConfigKeys(array $config): void
         $defaultStoreValue = 'test_store';
         static::assertSame($defaultStoreValue, (string) $xml->getNode(self::XML_PATH_STORE));
 
-        // phpcs:ignore Ecg.Classes.ObjectInstantiation.DirectInstantiation
         $loader = new Mage_Core_Helper_EnvironmentConfigLoader();
+        /** @phpstan-ignore method.internal */
         $loader->setEnvStore([
             $config['path'] => $config['value'],
         ]);