[WIP] Add deprecation for passing incorrect type to Escaper

lib/internal/Magento/Framework/Escaper.php

@@ -291,6 +291,13 @@ public function escapeUrl($string)
      */
     public function encodeUrlParam($string)
     {
+        if (!is_string($string)) {
+            $message = 'Argument #1 passed to %s needs to be an string, but got %s.'
+                . ' In future versions this will throw an error';
+
+            trigger_error(sprintf($message, __METHOD__, gettype($string)), E_USER_DEPRECATED);
+        }
+
         return $this->getEscaper()->escapeUrl((string)$string);
     }
 
@@ -330,6 +337,13 @@ function ($matches) {
      */
     public function escapeCss($string)
     {
+        if (!is_string($string)) {
+            $message = 'Argument #1 passed to %s needs to be an string, but got %s.'
+                . ' In future versions this will throw an error';
+
+            trigger_error(sprintf($message, __METHOD__, gettype($string)), E_USER_DEPRECATED);
+        }
+
         return $this->getEscaper()->escapeCss((string)$string);
     }
 

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

@@ -367,14 +367,23 @@ public function testEscapeUrl(string $data, string $expected): void
     /**
      * @covers \Magento\Framework\Escaper::escapeCss
      *
-     * @param string $data
+     * @param int|string $data
      * @param string $expected
+     * @param string|null $deprecatedType
      * @return void
      *
      * @dataProvider escapeCssDataProvider
      */
-    public function testEscapeCss($data, string $expected): void
+    public function testEscapeCss($data, string $expected, string $deprecatedType = null): void
     {
+        if ($deprecatedType) {
+            $this->expectDeprecation();
+
+            $message = 'Magento\Framework\Escaper::escapeCss needs to be an string, but got '
+                . $deprecatedType . '. In future versions this will throw an error';
+            $this->expectDeprecationMessage($message);
+        }
+
         $this->assertEquals($expected, $this->escaper->escapeCss($data));
     }
 
@@ -387,6 +396,7 @@ public function escapeCssDataProvider(): array
             [
                 'data'     => 1,
                 'expected' => '1',
+                'deprecatedType' => 'integer'
             ],
             [
                 'data'     => '*%string{foo}%::',
@@ -398,14 +408,23 @@ public function escapeCssDataProvider(): array
     /**
      * @covers \Magento\Framework\Escaper::encodeUrlParam
      *
-     * @param string $data
+     * @param int|string $data
      * @param string $expected
+     * @param string|null $deprecatedType
      * @return void
      *
      * @dataProvider encodeUrlParamDataProvider
      */
-    public function testEncodeUrlParam($data, string $expected): void
+    public function testEncodeUrlParam($data, string $expected, string $deprecatedType = null): void
     {
+        if($deprecatedType) {
+            $this->expectDeprecation();
+
+            $message = 'Magento\Framework\Escaper::encodeUrlParam needs to be an string, but got '
+                . $deprecatedType . '. In future versions this will throw an error';
+            $this->expectDeprecationMessage($message);
+        }
+
         $this->assertEquals($expected, $this->escaper->encodeUrlParam($data));
     }
 
@@ -426,10 +445,12 @@ public function encodeUrlParamDataProvider(): array
             [
                 'data'     => 1,
                 'expected' => "1",
+                'deprecatedType' => 'integer'
             ],
             [
                 'data'     => null,
                 'expected' => "",
+                'deprecatedType' => 'NULL'
             ]
         ];
     }