Merge pull request #113 from bramley/no_encoding_unit_test

Set the DOM encoding to UTF-8 when it is not specified in a feed's xml declaration

Author: froschdesign

src/Reader/Reader.php

@@ -363,6 +363,9 @@ public static function importString($string)
         $disableEntityLoaderFlag = self::disableEntityLoader();
         $dom                     = new DOMDocument();
         $status                  = $dom->loadXML(trim($string));
+        if ($dom->encoding === null) {
+            $dom->encoding = 'UTF-8';
+        }
         foreach ($dom->childNodes as $child) {
             if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
                 throw new Exception\InvalidArgumentException(

test/Reader/Entry/AtomStandaloneEntryTest.php

@@ -249,6 +249,20 @@ public function testGetsContentFromAtom10XhtmlNamespaced(): void
         $this->assertEquals('<p class="x:"><em>Entry Content &amp;x:</em></p>', $entry->getContent());
     }
 
+    /**
+     * XHTML document does not have encoding
+     *
+     * @group LaminasRATOMCONTENT
+     */
+    public function testGetsContentFromAtom10XhtmlNamespacedNoEncoding(): void
+    {
+        $entry = Reader\Reader::importString(
+            file_get_contents($this->feedSamplePath . '/content/atom10_XhtmlNoEncoding.xml')
+        );
+        $this->assertInstanceOf(Atom::class, $entry);
+        $this->assertEquals('<p class="x:"><em>Entry Content &amp;x:</em></p>', $entry->getContent());
+    }
+
     /**
      * Get Link (Unencoded Text)
      *

test/Reader/Entry/_files/AtomStandaloneEntry/content/atom10_XhtmlNoEncoding.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" ?>
+    <entry xmlns="http://www.w3.org/2005/Atom">
+        <content type="xhtml" xmlns:x="http://www.w3.org/1999/xhtml">
+            <x:div>
+                <x:p class="x:"><x:em>Entry Content &amp;x:</x:em></x:p>
+            </x:div>
+        </content>
+    </entry>