summaryrefslogtreecommitdiffstats
path: root/php-jms-serializer-php8.patch
blob: cfe41abaec0c43700a1c8a2d96d01bbe809f8c7b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
diff -up ./src/JMS/Serializer/XmlDeserializationVisitor.php.php8 ./src/JMS/Serializer/XmlDeserializationVisitor.php
--- ./src/JMS/Serializer/XmlDeserializationVisitor.php.php8	2021-03-31 13:54:50.261719313 +0200
+++ ./src/JMS/Serializer/XmlDeserializationVisitor.php	2021-03-31 13:54:57.315695261 +0200
@@ -48,7 +48,7 @@ class XmlDeserializationVisitor extends
         $previous = libxml_use_internal_errors(true);
         libxml_clear_errors();
 
-        $previousEntityLoaderState = libxml_disable_entity_loader($this->disableExternalEntities);
+        $previousEntityLoaderState = @libxml_disable_entity_loader($this->disableExternalEntities);
 
         if (false !== stripos($data, '<!doctype')) {
             $internalSubset = $this->getDomDocumentTypeEntitySubset($data);
@@ -63,7 +63,7 @@ class XmlDeserializationVisitor extends
         $doc = simplexml_load_string($data);
 
         libxml_use_internal_errors($previous);
-        libxml_disable_entity_loader($previousEntityLoaderState);
+        @libxml_disable_entity_loader($previousEntityLoaderState);
 
         if (false === $doc) {
             throw new XmlErrorException(libxml_get_last_error());
@@ -176,7 +176,7 @@ class XmlDeserializationVisitor extends
             $nodes = $data->xpath($entryName);
         }
 
-        if (!\count($nodes)) {
+        if (!($nodes && \count($nodes))) {
             if (null === $this->result) {
                 return $this->result = array();
             }