Merge remote-tracking branch 'origin/AC-7790' into Hammer_Release_Regression_Issues_29Jan22

Author: glo71317

app/code/Magento/Payment/Block/Transparent/Redirect.php

@@ -67,7 +67,7 @@ public function getPostParams(): array
         $params = [];
         foreach ($this->_request->getPostValue() as $name => $value) {
             if (!empty($value) && mb_detect_encoding($value, 'UTF-8', true) === false) {
-                $value = utf8_encode($value);
+                $value = mb_convert_encoding($value, 'UTF-8', 'ISO-8859-1');
             }
             $params[$name] = $value;
         }

app/code/Magento/Rule/Test/Unit/Model/Condition/Product/AbstractProductTest.php

@@ -174,7 +174,6 @@ public function testValidateEmptyEntityAttributeValuesWithResource()
             ->method('getAttribute')
             ->with('someAttribute')
             ->willReturn($attribute);
-        $newResource->_config = $this->createMock(Config::class);
         $product->expects($this->atLeastOnce())
             ->method('getResource')
             ->willReturn($newResource);
@@ -190,7 +189,6 @@ public function testValidateEmptyEntityAttributeValuesWithResource()
             ->method('getAttribute')
             ->with('someAttribute')
             ->willReturn($attribute);
-        $newResource->_config = $this->createMock(Config::class);
 
         $product->setResource($newResource);
         $this->assertFalse($this->_condition->validate($product));
@@ -228,7 +226,6 @@ public function testValidateSetEntityAttributeValuesWithResource()
             ->method('getAttribute')
             ->with('someAttribute')
             ->willReturn($attribute);
-        $newResource->_config = $this->createMock(Config::class);
 
         $product->expects($this->atLeastOnce())
             ->method('getResource')
@@ -277,7 +274,6 @@ public function testValidateSetEntityAttributeValuesWithoutResource()
             ->method('getAttribute')
             ->with('someAttribute')
             ->willReturn($attribute);
-        $newResource->_config = $this->createMock(Config::class);
 
         $product->expects($this->atLeastOnce())
             ->method('getResource')
@@ -303,7 +299,6 @@ public function testValidateSetEntityAttributeValuesWithoutResource()
             ->method('getAttribute')
             ->with('someAttribute')
             ->willReturn($attribute);
-        $newResource->_config = $this->createMock(Config::class);
 
         $product->setResource($newResource);
         $product->setId(1);

composer.lock

@@ -1,7 +1,5 @@
 <?php
 /**
- * Test for \Magento\Framework\Filesystem\Driver\File
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -13,6 +11,7 @@
 use PHPUnit\Framework\TestCase;
 
 /**
+ * Test for \Magento\Framework\Filesystem\Driver\File
  * Verify File class
  */
 class FileTest extends TestCase
@@ -104,7 +103,7 @@ public function testReadDirectoryRecursively(): void
             'foo/bar/file_two.txt',
             'foo/file_three.txt',
         ];
-        $expected = array_map(['self', 'getTestPath'], $paths);
+        $expected = array_map([self::class, 'getTestPath'], $paths);
         $actual = $this->driver->readDirectoryRecursively($this->getTestPath('foo'));
         sort($actual);
         $this->assertEquals($expected, $actual);

dev/tests/integration/testsuite/Magento/Framework/Filesystem/Driver/FileTest.php

@@ -13,6 +13,7 @@
  * Class performs assertion that generated simple products are valid
  * after running setup:performance:generate-fixtures command
  */
+#[\AllowDynamicProperties]
 class SimpleProductsAssert
 {
     /**

dev/tests/integration/testsuite/Magento/Setup/Fixtures/FixturesAsserts/SimpleProductsAssert.php

@@ -21,6 +21,7 @@
  * @api
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
+#[\AllowDynamicProperties]
 class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
 {
     /** Cookie to store page vary string */

lib/internal/Magento/Framework/App/Response/Http.php

@@ -11,6 +11,7 @@
  * @api
  * @since 100.0.2
  */
+#[\AllowDynamicProperties]
 class Config
 {
     /**
@@ -31,6 +32,7 @@ class Config
      * Xpath describing nodes in configuration that need to be extended
      *
      * @example <allResources extends="/config/modules//resource"/>
+     * @var string
      */
     protected $_xpathExtends = "//*[@extends]";
 

lib/internal/Magento/Framework/Simplexml/Config.php

@@ -20,6 +20,7 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * phpcs:ignoreFile
  */
+#[\AllowDynamicProperties]
 class Processor
 {
     const MAGE_ERRORS_LOCAL_XML = 'local.xml';