Skip to content

Commit f85e976

Browse files
committed
use encded xml
1 parent cbd8185 commit f85e976

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

src/XmlReader/BaseXmlReader.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,7 @@ protected function getLine(): ?string
177177
//или попадем на уровень выше - проверяем, что нашли нужный
178178
if ($nameFilter === $this->reader->name) {
179179
//некоторые проблемы с получением человекочитаемого xml
180-
$return = preg_replace_callback('/&#[A-Z0-9]+;/i', function (array $matches): string {
181-
return html_entity_decode($matches[0]);
182-
}, $this->reader->readOuterXml());
180+
$return = $this->reader->readOuterXml();
183181
//нужно передвинуть указатель, чтобы дважды не прочитать
184182
//один и тот же элемент
185183
$this->reader->next();

tests/src/Serializer/FiasSerializerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class FiasSerializerTest extends BaseCase
1919
*/
2020
public function testDenormalize()
2121
{
22-
$data = '<ActualStatus ACTSTATID="2" NAME="Не актуальный" TESTDATE="2019-10-10T10:10:10.02" KOD_T_ST="10"/>';
22+
$data = '<ActualStatus ACTSTATID="2" NAME="&#x41D;&#x435; &#x430;&#x43A;&#x442;&#x443;&#x430;&#x43B;&#x44C;&#x43D;&#x44B;&#x439;" TESTDATE="2019-10-10T10:10:10.02" KOD_T_ST="10"/>';
2323
$serializer = new FiasSerializer;
2424

2525
$object = $serializer->deserialize($data, FiasSerializerObject::class, 'xml');

tests/src/XmlReader/BaseXmlReaderTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ public function testRead()
7272

7373
$this->assertSame(
7474
[
75-
0 => '<ActualStatus ACTSTATID="0" NAME="Не актуальный &lt;&lt;A&gt;&gt;"/>',
76-
1 => '<ActualStatus ACTSTATID="1" NAME="Актуальный"/>',
77-
2 => '<ActualStatus ACTSTATID="2" NAME="3-й &quot;А&quot;"/>',
75+
0 => '<ActualStatus ACTSTATID="0" NAME="&#x41D;&#x435; &#x430;&#x43A;&#x442;&#x443;&#x430;&#x43B;&#x44C;&#x43D;&#x44B;&#x439; &lt;&lt;A&gt;&gt;"/>',
76+
1 => '<ActualStatus ACTSTATID="1" NAME="&#x410;&#x43A;&#x442;&#x443;&#x430;&#x43B;&#x44C;&#x43D;&#x44B;&#x439;"/>',
77+
2 => '<ActualStatus ACTSTATID="2" NAME="3-&#x439; &quot;&#x410;&quot;"/>',
7878
],
7979
$result
8080
);

0 commit comments

Comments
 (0)