Merge pull request #33353 from tufahu/fix-laminas-escaper-type

Incompatibility with laminas-escaper (>=2.7.1) has been fixed
magento · Jul 30, 2021 · 057e838 · 057e838
2 parents 356a4c9 + 733dec5
commit 057e838
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 3 deletions.
diff --git a/lib/internal/Magento/Framework/Escaper.php b/lib/internal/Magento/Framework/Escaper.php
@@ -291,7 +291,7 @@ public function escapeUrl($string)
      */
     public function encodeUrlParam($string)
     {
-        return $this->getEscaper()->escapeUrl($string);
+        return $this->getEscaper()->escapeUrl((string)$string);
     }
 
     /**
@@ -330,7 +330,7 @@ function ($matches) {
      */
     public function escapeCss($string)
     {
-        return $this->getEscaper()->escapeCss($string);
+        return $this->getEscaper()->escapeCss((string)$string);
     }
 
     /**

diff --git a/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php b/lib/internal/Magento/Framework/Test/Unit/EscaperTest.php
@@ -364,6 +364,76 @@ public function testEscapeUrl(string $data, string $expected): void
         $this->assertEquals($expected, $this->escaper->escapeUrl($expected));
     }
 
+    /**
+     * @covers \Magento\Framework\Escaper::escapeCss
+     *
+     * @param string $data
+     * @param string $expected
+     * @return void
+     *
+     * @dataProvider escapeCssDataProvider
+     */
+    public function testEscapeCss($data, string $expected): void
+    {
+        $this->assertEquals($expected, $this->escaper->escapeCss($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function escapeCssDataProvider(): array
+    {
+        return [
+            [
+                'data'     => 1,
+                'expected' => '1',
+            ],
+            [
+                'data'     => '*%string{foo}%::',
+                'expected' => '\2A \25 string\7B foo\7D \25 \3A \3A ',
+            ]
+        ];
+    }
+
+    /**
+     * @covers \Magento\Framework\Escaper::encodeUrlParam
+     *
+     * @param string $data
+     * @param string $expected
+     * @return void
+     *
+     * @dataProvider encodeUrlParamDataProvider
+     */
+    public function testEncodeUrlParam($data, string $expected): void
+    {
+        $this->assertEquals($expected, $this->escaper->encodeUrlParam($data));
+    }
+
+    /**
+     * @return array
+     */
+    public function encodeUrlParamDataProvider(): array
+    {
+        return [
+            [
+                'data'     => "a3==",
+                'expected' => "a3%3D%3D",
+            ],
+            [
+                'data'     => "example string",
+                'expected' => "example%20string",
+            ],
+            [
+                'data'     => 1,
+                'expected' => "1",
+            ],
+            [
+                'data'     => null,
+                'expected' => "",
+            ]
+        ];
+    }
+
     /**
      * @return array
      */

diff --git a/lib/internal/Magento/Framework/Url/RouteParamsResolver.php b/lib/internal/Magento/Framework/Url/RouteParamsResolver.php
@@ -112,7 +112,7 @@ public function setRouteParams(array $data, $unsetOldParams = true)
             } else {
                 $this->setRouteParam(
                     $this->getEscaper()->encodeUrlParam($key),
-                    $this->getEscaper()->encodeUrlParam($value)
+                    $this->getEscaper()->encodeUrlParam((string)$value)
                 );
             }
         }