Merge branch 'enforced_utf_8_encoding' into 'main'

Enforced UTF-8 encoding on DOMDocument See merge request softwares-pkp/plugins_ojs/fullJournalTransfer!62
lepidus · Feb 10, 2025 · 4fbcc33 · 4fbcc33
2 parents 12610a3 + fda5eaa
commit 4fbcc33
Show file tree

Hide file tree

Showing 19 changed files with 31 additions and 31 deletions.
diff --git a/filter/export/AnnouncementNativeXmlFilter.inc.php b/filter/export/AnnouncementNativeXmlFilter.inc.php
@@ -22,7 +22,7 @@ public function getClassName()
 
     public function &process(&$announcements)
     {
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
         $deployment = $this->getDeployment();

diff --git a/filter/export/AnnouncementTypeNativeXmlFilter.inc.php b/filter/export/AnnouncementTypeNativeXmlFilter.inc.php
@@ -22,7 +22,7 @@ public function getClassName()
 
     public function &process(&$announcementTypes)
     {
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
         $deployment = $this->getDeployment();

diff --git a/filter/export/JournalNativeXmlFilter.inc.php b/filter/export/JournalNativeXmlFilter.inc.php
@@ -80,7 +80,7 @@ private function getJournalLocalizedProps()
 
     public function &process(&$journal)
     {
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
         $deployment = $this->getDeployment();

diff --git a/filter/export/NavigationMenuItemNativeXmlFilter.inc.php b/filter/export/NavigationMenuItemNativeXmlFilter.inc.php
@@ -22,7 +22,7 @@ public function getClassName()
 
     public function &process(&$navigationMenuItems)
     {
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
         $deployment = $this->getDeployment();

diff --git a/filter/export/NavigationMenuNativeXmlFilter.inc.php b/filter/export/NavigationMenuNativeXmlFilter.inc.php
@@ -22,7 +22,7 @@ public function getClassName()
 
     public function &process(&$navigationMenus)
     {
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
         $deployment = $this->getDeployment();

diff --git a/filter/export/PluginNativeXmlFilter.inc.php b/filter/export/PluginNativeXmlFilter.inc.php
@@ -22,7 +22,7 @@ public function getClassName()
 
     public function &process(&$plugins)
     {
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
         $deployment = $this->getDeployment();

diff --git a/filter/export/ReviewFormElementNativeXmlFilter.inc.php b/filter/export/ReviewFormElementNativeXmlFilter.inc.php
@@ -22,7 +22,7 @@ public function getClassName()
 
     public function &process(&$reviewFormElements)
     {
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
         $deployment = $this->getDeployment();

diff --git a/filter/export/ReviewFormNativeXmlFilter.inc.php b/filter/export/ReviewFormNativeXmlFilter.inc.php
@@ -22,7 +22,7 @@ public function getClassName()
 
     public function &process(&$reviewForms)
     {
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
         $deployment = $this->getDeployment();

diff --git a/filter/import/NativeXmlJournalFilter.inc.php b/filter/import/NativeXmlJournalFilter.inc.php
@@ -234,7 +234,7 @@ public function parseUsers($node, $journal)
 
         echo __('plugins.importexport.fullJournal.importingUsers') . "\n";
 
-        $usersDoc = new DOMDocument('1.0');
+        $usersDoc = new DOMDocument('1.0', 'utf-8');
         $usersDoc->preserveWhiteSpace = false;
         $usersDoc->formatOutput = true;
         $usersDoc->appendChild($usersDoc->importNode($node, true));

diff --git a/tests/NativeImportExportFilterTestCase.inc.php b/tests/NativeImportExportFilterTestCase.inc.php
@@ -12,7 +12,7 @@ protected function setUp(): void
     {
         parent::setUp();
 
-        $this->doc = new DOMDocument('1.0');
+        $this->doc = new DOMDocument('1.0', 'utf-8');
         $this->doc->preserveWhiteSpace = false;
         $this->doc->formatOutput = true;
 
@@ -46,7 +46,7 @@ abstract protected function getNativeImportExportFilterClass();
     protected function getSampleXml($sampleFile)
     {
         $fileContent = file_get_contents(__DIR__ . '/samples/' . $sampleFile);
-        $xml = new DOMDocument('1.0');
+        $xml = new DOMDocument('1.0', 'utf-8');
         $xml->loadXML($fileContent);
 
         return $xml;

diff --git a/tests/export/AnnouncementNativeXmlFilterTest.php b/tests/export/AnnouncementNativeXmlFilterTest.php
@@ -73,7 +73,7 @@ public function testAddDateElements()
     {
         $deployment = $this->announcementExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -107,7 +107,7 @@ public function testCreateAnnouncementNode()
     {
         $deployment = $this->announcementExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 

diff --git a/tests/export/AnnouncementTypeNativeXmlFilterTest.php b/tests/export/AnnouncementTypeNativeXmlFilterTest.php
@@ -21,7 +21,7 @@ public function testCreateAnnouncementTypeNode()
         $announcementTypeExportFilter = $this->getNativeImportExportFilter();
         $deployment = $announcementTypeExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 

diff --git a/tests/export/JournalNativeXmlFilterTest.php b/tests/export/JournalNativeXmlFilterTest.php
@@ -665,7 +665,7 @@ public function testCreateSubmissionChecklistNode()
         $journalExportFilter = $this->getNativeImportExportFilter();
         $deployment = $journalExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -693,7 +693,7 @@ public function testCreateJournalOptionalNodes()
         $journalExportFilter = $this->getNativeImportExportFilter();
         $deployment = $journalExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -717,7 +717,7 @@ public function testCreateJournalLocalizedNodes()
         $journalExportFilter = $this->getNativeImportExportFilter();
         $deployment = $journalExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -807,7 +807,7 @@ public function testAddPlugins()
         $deployment->setContext($journal);
         $journalExportFilter->setDeployment($deployment);
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -834,7 +834,7 @@ public function testAddSections()
 
         $journal = $this->createJournal();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -859,7 +859,7 @@ public function testAddMetrics()
 
         $journal = $this->createJournal();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -894,7 +894,7 @@ public function testCreateJournalNode()
         $journalExportFilter = $this->getNativeImportExportFilter();
         $deployment = $journalExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 

diff --git a/tests/export/NavigationMenuItemNativeXmlFilterTest.php b/tests/export/NavigationMenuItemNativeXmlFilterTest.php
@@ -21,7 +21,7 @@ public function testCreateNavigationMenuItemNode()
         $navMenuItemExportFilter = $this->getNativeImportExportFilter();
         $deployment = $navMenuItemExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 

diff --git a/tests/export/NavigationMenuNativeXmlFilterTest.php b/tests/export/NavigationMenuNativeXmlFilterTest.php
@@ -39,7 +39,7 @@ public function testAddNavigationMenuAssignments()
         $navMenuExportFilter = $this->getNativeImportExportFilter();
         $deployment = $navMenuExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -72,7 +72,7 @@ public function testCreateNavigationMenuNode()
         $navMenuExportFilter = $this->getNativeImportExportFilter();
         $deployment = $navMenuExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 

diff --git a/tests/export/PluginNativeXmlFilterTest.php b/tests/export/PluginNativeXmlFilterTest.php
@@ -26,7 +26,7 @@ public function testCreatePluginNode()
         $pluginExportFilter = $this->getNativeImportExportFilter();
         $deployment = $pluginExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 

diff --git a/tests/export/ReviewFormElementNativeXmlFilterTest.php b/tests/export/ReviewFormElementNativeXmlFilterTest.php
@@ -39,7 +39,7 @@ public function testAddPossibleResponsesNode()
             'en_US' => ['option 1','option 2', 'option 3']
         ];
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -71,7 +71,7 @@ public function testCreateReviewFormElementNode()
         $reviewFormElementExportFilter = $this->getNativeImportExportFilter();
         $deployment = $reviewFormElementExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 

diff --git a/tests/export/ReviewFormNativeXmlFilterTest.php b/tests/export/ReviewFormNativeXmlFilterTest.php
@@ -94,7 +94,7 @@ public function testAddReviewFormElements()
         $reviewFormExportFilter = $this->getNativeImportExportFilter();
         $deployment = $reviewFormExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 
@@ -120,7 +120,7 @@ public function testCreateReviewFormNode()
         $reviewFormExportFilter = $this->getNativeImportExportFilter();
         $deployment = $reviewFormExportFilter->getDeployment();
 
-        $doc = new DOMDocument('1.0');
+        $doc = new DOMDocument('1.0', 'utf-8');
         $doc->preserveWhiteSpace = false;
         $doc->formatOutput = true;
 

diff --git a/version.xml b/version.xml
@@ -10,7 +10,7 @@
 <version>
 	<application>fullJournalTransfer</application>
 	<type>plugins.importexport</type>
-	<release>2.0.15.0</release>
-	<date>2024-09-12</date>
+	<release>2.0.16.0</release>
+	<date>2025-02-10</date>
     <class>FullJournalImportExportPlugin</class>
 </version>