Merge pull request #12 from celli33/main

Codificación de los caracteres especiales

Author: eclipxe13

src/Extractors/Comprobante32.php

@@ -59,8 +59,8 @@ public function format(array $values): string
     {
         return '?'
             . implode('&', [
-                're=' . ($values['re'] ?? ''),
-                'rr=' . ($values['rr'] ?? ''),
+                're=' . (htmlentities($values['re'] ?? '', ENT_XML1)),
+                'rr=' . (htmlentities($values['rr'] ?? '', ENT_XML1)),
                 'tt=' . $this->formatTotal($values['tt'] ?? ''),
                 'id=' . ($values['id'] ?? ''),
             ]);

src/Extractors/Comprobante33.php

@@ -62,8 +62,8 @@ public function format(array $values): string
         return 'https://verificacfdi.facturaelectronica.sat.gob.mx/default.aspx?'
             . implode('&', [
                 'id=' . ($values['id'] ?? ''),
-                're=' . ($values['re'] ?? ''),
-                'rr=' . ($values['rr'] ?? ''),
+                're=' . (htmlentities($values['re'] ?? '', ENT_XML1)),
+                'rr=' . (htmlentities($values['rr'] ?? '', ENT_XML1)),
                 'tt=' . $this->formatTotal($values['tt'] ?? ''),
                 'fe=' . ($values['fe'] ?? ''),
             ]);

src/Extractors/Retenciones10.php

@@ -103,8 +103,8 @@ public function format(array $values): string
         }
         return '?'
             . implode('&', [
-                're=' . ($values['re'] ?? ''),
-                $receptorKey . '=' . ($values[$receptorKey] ?? ''),
+                're=' . (htmlentities($values['re'] ?? '', ENT_XML1)),
+                $receptorKey . '=' . (htmlentities($values[$receptorKey] ?? '', ENT_XML1)),
                 'tt=' . $this->formatTotal($values['tt'] ?? ''),
                 'id=' . ($values['id'] ?? ''),
             ]);

tests/Unit/Extractors/Comprobante32Test.php

@@ -67,4 +67,22 @@ public function testHowTotalMustBeFormatted(string $input, string $expectedForma
         $extractor = new Comprobante32();
         $this->assertSame($expectedFormat, $extractor->formatTotal($input));
     }
+
+    public function testFormatCfdi32RfcWithAmpersand(): void
+    {
+        $extractor = new Comprobante32();
+        $expected32 = implode([
+            '?re=Ñ&A010101AAA',
+            '&rr=Ñ&A991231AA0',
+            '&tt=0000001234.567800',
+            '&id=CEE4BE01-ADFA-4DEB-8421-ADD60F0BEDAC',
+        ]);
+        $parameters = [
+            're' => 'Ñ&A010101AAA',
+            'rr' => 'Ñ&A991231AA0',
+            'tt' => '1234.5678',
+            'id' => 'CEE4BE01-ADFA-4DEB-8421-ADD60F0BEDAC',
+        ];
+        $this->assertSame($expected32, $extractor->format($parameters));
+    }
 }

tests/Unit/Extractors/Comprobante33Test.php

@@ -65,4 +65,25 @@ public function testHowTotalMustBeFormatted(string $input, string $expectedForma
         $extractor = new Comprobante33();
         $this->assertSame($expectedFormat, $extractor->formatTotal($input));
     }
+
+    public function testFormatCfdi33RfcWithAmpersand(): void
+    {
+        $extractor = new Comprobante33();
+        $expected33 = implode([
+            'https://verificacfdi.facturaelectronica.sat.gob.mx/default.aspx',
+            '?id=CEE4BE01-ADFA-4DEB-8421-ADD60F0BEDAC',
+            '&re=Ñ&A010101AAA',
+            '&rr=Ñ&A991231AA0',
+            '&tt=1234.5678',
+            '&fe=23456789',
+        ]);
+        $parameters = [
+            'id' => 'CEE4BE01-ADFA-4DEB-8421-ADD60F0BEDAC',
+            're' => 'Ñ&A010101AAA',
+            'rr' => 'Ñ&A991231AA0',
+            'tt' => '1234.5678',
+            'fe' => '23456789',
+        ];
+        $this->assertSame($expected33, $extractor->format($parameters));
+    }
 }

tests/Unit/Extractors/Retenciones10Test.php

@@ -88,4 +88,22 @@ public function testHowTotalMustBeFormatted(string $input, string $expectedForma
         $extractor = new Retenciones10();
         $this->assertSame($expectedFormat, $extractor->formatTotal($input));
     }
+
+    public function testFormatRetenciones10RfcWithAmpersand(): void
+    {
+        $extractor = new Retenciones10();
+        $expectedRetenciones10 = implode([
+            '?re=Ñ&A010101AAA',
+            '&rr=Ñ&A991231AA0',
+            '&tt=0002000000.000000',
+            '&id=fc1b47b2-42f3-4ca2-8587-36e0a216c4d5',
+        ]);
+        $parameters = [
+            're' => 'Ñ&A010101AAA',
+            'rr' => 'Ñ&A991231AA0',
+            'tt' => '2000000.00',
+            'id' => 'fc1b47b2-42f3-4ca2-8587-36e0a216c4d5',
+        ];
+        $this->assertSame($expectedRetenciones10, $extractor->format($parameters));
+    }
 }