Merge remote-tracking branch 'engcom/2.4-develop' into module-login-as-customer

Author: naydav

app/code/Magento/Customer/Block/Address/Renderer/DefaultRenderer.php

@@ -8,6 +8,7 @@
 use Magento\Customer\Model\Address\AddressModelInterface;
 use Magento\Customer\Model\Address\Mapper;
 use Magento\Customer\Model\Metadata\ElementFactory;
+use Magento\Directory\Model\Country\Format;
 use Magento\Framework\View\Element\AbstractBlock;
 
 /**
@@ -91,6 +92,8 @@ public function setType(\Magento\Framework\DataObject $type)
     }
 
     /**
+     * Get the format of the address
+     *
      * @param AddressModelInterface|null $address
      * @return string
      * All new code should use renderArray based on Metadata service
@@ -106,8 +109,11 @@ public function getFormat(AddressModelInterface $address = null)
     }
 
     /**
-     * {@inheritdoc}
+     * Render address
      *
+     * @param AddressModelInterface $address
+     * @param string|null $format
+     * @return mixed
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -118,7 +124,7 @@ public function render(AddressModelInterface $address, $format = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFormatArray($addressAttributes = null)
     {
@@ -133,8 +139,11 @@ public function getFormatArray($addressAttributes = null)
     }
 
     /**
-     * {@inheritdoc}
+     * Render address by attribute array
      *
+     * @param array $addressAttributes
+     * @param Format|null $format
+     * @return string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -167,7 +176,7 @@ public function renderArray($addressAttributes, $format = null)
                     $addressAttributes['country_id']
                 )->getName();
             } elseif ($attributeCode == 'region' && isset($addressAttributes['region'])) {
-                $data['region'] = __($addressAttributes['region']);
+                $data['region'] = (string)__($addressAttributes['region']);
             } elseif (isset($addressAttributes[$attributeCode])) {
                 $value = $addressAttributes[$attributeCode];
                 $dataModel = $this->_elementFactory->create($attributeMetadata, $value, 'customer_address');

dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/SimpleDirectiveTest.php

@@ -74,6 +74,7 @@ public function testDefaultFiltersAreUsed()
     public function testParametersAreParsed()
     {
         $filter = $this->objectManager->create(Template::class);
+        $filter->setStrictMode(false);
 
         $processor = $this->createWithProcessorsAndFilters(
             ['mydir' => $this->objectManager->create(MyDirProcessor::class)],

dev/tests/integration/testsuite/Magento/Framework/Filter/TemplateTest.php

@@ -155,6 +155,7 @@ public function testIfDirective()
 
     public function testNonDataObjectVariableParsing()
     {
+        $previous = $this->templateFilter->setStrictMode(false);
         $this->templateFilter->setVariables(
             [
                 'address' => new class {
@@ -168,11 +169,33 @@ public function format($type)
 
         $template = '{{var address.format(\'html\')}}';
         $expected = '<foo>html</foo>';
-        self::assertEquals($expected, $this->templateFilter->filter($template));
+        try {
+            self::assertEquals($expected, $this->templateFilter->filter($template));
+        } finally {
+            $this->templateFilter->setStrictMode($previous);
+        }
+    }
+
+    public function testStrictModeByDefault()
+    {
+        $this->templateFilter->setVariables(
+            [
+                'address' => new class {
+                    public function format()
+                    {
+                        throw new \Exception('Should not run');
+                    }
+                }
+            ]
+        );
+
+        $template = '{{var address.format(\'html\')}}';
+        self::assertEquals('', $this->templateFilter->filter($template));
     }
 
     public function testComplexVariableArguments()
     {
+        $previous = $this->templateFilter->setStrictMode(false);
         $this->templateFilter->setVariables(
             [
                 'address' => new class {
@@ -187,11 +210,16 @@ public function format($a, $b, $c)
 
         $template = '{{var address.format($arg1,\'bar\',[param1:baz])}}';
         $expected = 'foo bar baz';
-        self::assertEquals($expected, $this->templateFilter->filter($template));
+        try {
+            self::assertEquals($expected, $this->templateFilter->filter($template));
+        } finally {
+            $this->templateFilter->setStrictMode($previous);
+        }
     }
 
     public function testComplexVariableGetterArguments()
     {
+        $previous = $this->templateFilter->setStrictMode(false);
         $this->templateFilter->setVariables(
             [
                 'address' => new class extends DataObject {
@@ -206,7 +234,11 @@ public function getFoo($a, $b, $c)
 
         $template = '{{var address.getFoo($arg1,\'bar\',[param1:baz])}}';
         $expected = 'foo bar baz';
-        self::assertEquals($expected, $this->templateFilter->filter($template));
+        try {
+            self::assertEquals($expected, $this->templateFilter->filter($template));
+        } finally {
+            $this->templateFilter->setStrictMode($previous);
+        }
     }
 
     public function testNonDataObjectRendersBlankInStrictMode()

dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt

@@ -7,6 +7,7 @@ lib/internal/Magento/Framework/Interception/Test/Unit/Config/ConfigTest.php
 lib/internal/Magento/Framework/Cache/Backend/Eaccelerator.php
 lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php
 dev/tests/integration/framework/deployTestModules.php
+dev/tests/integration/testsuite/Magento/Framework/Filter/DirectiveProcessor/SimpleDirectiveTest.php
 dev/tests/integration/testsuite/Magento/Framework/Session/ConfigTest.php
 dev/tests/integration/testsuite/Magento/Framework/Session/SessionManagerTest.php
 dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/AbstractFiltersTest.php

lib/internal/Magento/Framework/Filter/Template.php

@@ -91,7 +91,7 @@ class Template implements \Zend_Filter_Interface
     /**
      * @var bool
      */
-    private $strictMode = false;
+    private $strictMode = true;
 
     /**
      * @var VariableResolverInterface|null