fix: wrong encoding on tel: href

Author: theus77

EMS/common-bundle/src/Helper/Text/Encoder.php

@@ -39,13 +39,12 @@ public function htmlEncodePii(string $text): string
 
     /**
      * Detect telephone information using the '"tel:xxx"' pattern
-     * <a href="tel:02/123.45.23">02/123.45.23</a>.
+     * <a href="tel:+3221234523">02/123.45.23</a>.
      */
     private function encodePhone(string $text): string
     {
-        $telRegex = '/(?P<tel>"tel:.*")/i';
-
-        $encodedText = \preg_replace_callback($telRegex, fn ($match) => $this->htmlEncode($match['tel']), $text);
+        $telRegex = '/"tel:(?P<tel>.*)"/i';
+        $encodedText = \preg_replace_callback($telRegex, fn ($match) => \sprintf('"tel:%s"', $this->htmlEncode($match['tel'])), $text);
 
         if (null === $encodedText) {
             return $text;

EMS/common-bundle/tests/Unit/Helper/Text/EncoderAiTest.php

@@ -66,6 +66,6 @@ public function testHtmlEncodePiiEncodesPhoneNumbers(): void
         $textWithPhone = 'Call me at <a href="tel:123-456-7890">123-456-7890</a>';
         $encoded = $this->encoder->htmlEncodePii($textWithPhone);
 
-        $this->assertStringContainsString('&#34;&#116;&#101;&#108;&#58;&#49;&#50;&#51;&#45;&#52;&#53;&#54;&#45;&#55;&#56;&#57;&#48;&#34;', $encoded);
+        $this->assertEquals('Call me at <a href="tel:&#49;&#50;&#51;&#45;&#52;&#53;&#54;&#45;&#55;&#56;&#57;&#48;">123-456-7890</a>', $encoded);
     }
 }

EMS/common-bundle/tests/Unit/Helper/Text/EncoderTest.php

@@ -57,7 +57,9 @@ public static function piiProvider(): array
             ['é', 'é'],
             ['<', '<'],
             ['mailto:[email protected]', \sprintf('mailto:%s', $email)],
-            ['"tel:02/345.67.89"', '&#34;&#116;&#101;&#108;&#58;&#48;&#50;&#47;&#51;&#52;&#53;&#46;&#54;&#55;&#46;&#56;&#57;&#34;'],
+            ['<a href="mailto:[email protected]">[email protected]</a>', \sprintf('<a href="mailto:%s">%s</a>', $email, $email)],
+            ['"tel:02/345.67.89"', '"tel:&#48;&#50;&#47;&#51;&#52;&#53;&#46;&#54;&#55;&#46;&#56;&#57;"'],
+            ['<a href="tel:+3221234523">02/123.45.23</a>', '<a href="tel:&#43;&#51;&#50;&#50;&#49;&#50;&#51;&#52;&#53;&#50;&#51;">02/123.45.23</a>'],
             ['<span class="pii">example</span>', $example],
         ];
     }