Fix incompatibility with laminas-escaper (2.7.1)

lib/internal/Magento/Framework/Escaper.php

@@ -289,7 +289,7 @@ public function escapeUrl($string)
      * @return string
      * @since 101.0.0
      */
-    public function encodeUrlParam($string)
+    public function encodeUrlParam(string $string)
     {
         return $this->getEscaper()->escapeUrl($string);
     }
@@ -328,7 +328,7 @@ function ($matches) {
      * @return string
      * @since 101.0.0
      */
-    public function escapeCss($string)
+    public function escapeCss(string $string)
     {
         return $this->getEscaper()->escapeCss($string);
     }

lib/internal/Magento/Framework/Test/Unit/EscaperTest.php

@@ -364,6 +364,64 @@ 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'     => '*%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",
+            ]
+        ];
+    }
+
     /**
      * @return array
      */

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)
                 );
             }
         }