fix suppression of html parsing warnings

bmlt-enabled · Oct 28, 2023 · 77241de · 77241de
1 parent a6d8438
commit 77241de
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 35 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 1.0.6 (October 28, 2023)
+* Fix suppression of html parsing warnings.
+
 ## 1.0.5 (October 28, 2023)
 * Fix for PHP 8.1 compatibility, rm readonly class.
 

diff --git a/src/FetchMeditation/EnglishJFT.php b/src/FetchMeditation/EnglishJFT.php
@@ -13,12 +13,12 @@ public function getLanguage(): JFTLanguage
 
     public function fetch(): JFTEntry
     {
-        libxml_use_internal_errors(true);
         $data = HttpUtility::httpGet('https://www.jftna.org/jft/');
+        $doc = new \DOMDocument();
+        libxml_use_internal_errors(true);
+        $doc->loadHTML('<?xml encoding="UTF-8">' . $data);
         libxml_clear_errors();
         libxml_use_internal_errors(false);
-        $doc = new \DOMDocument();
-        $doc->loadHTML('<?xml encoding="UTF-8">' .  $data);
         $jftKeys = ['date', 'title', 'page', 'quote', 'source', 'content', 'thought', 'copyright'];
         $result = [];
         foreach ($doc->getElementsByTagName('td') as $i => $td) {

diff --git a/src/FetchMeditation/EnglishSPAD.php b/src/FetchMeditation/EnglishSPAD.php
@@ -13,12 +13,13 @@ public function getLanguage(): SPADLanguage
 
     public function fetch(): SPADEntry
     {
-        libxml_use_internal_errors(true);
+
         $data = HttpUtility::httpGet('https://spadna.org');
+        $doc = new \DOMDocument();
+        libxml_use_internal_errors(true);
+        $doc->loadHTML('<?xml encoding="UTF-8">' . $data);
         libxml_clear_errors();
         libxml_use_internal_errors(false);
-        $doc = new \DOMDocument();
-        $doc->loadHTML($data);
         $spadKeys = ['date', 'title', 'page', 'quote', 'source', 'content', 'divider', 'thought', 'copyright'];
         $result = [];
         foreach ($doc->getElementsByTagName('td') as $i => $td) {

diff --git a/src/FetchMeditation/FrenchJFT.php b/src/FetchMeditation/FrenchJFT.php
@@ -13,9 +13,9 @@ public function getLanguage(): JFTLanguage
 
     public function fetch(): JFTEntry
     {
-        libxml_use_internal_errors(true);
         $data = HttpUtility::httpGet('https://jpa.narcotiquesanonymes.org/');
         $doc = new \DOMDocument();
+        libxml_use_internal_errors(true);
         $doc->loadHTML('<?xml encoding="UTF-8">' . $data);
         libxml_clear_errors();
         libxml_use_internal_errors(false);

diff --git a/src/FetchMeditation/ItalianJFT.php b/src/FetchMeditation/ItalianJFT.php
@@ -13,10 +13,10 @@ public function getLanguage(): JFTLanguage
 
     public function fetch(): JFTEntry
     {
-        libxml_use_internal_errors(true);
         $data = HttpUtility::httpGet('https://na-italia.org/get-jft');
         $data = json_decode($data, true)[0];
         $doc = new \DOMDocument();
+        libxml_use_internal_errors(true);
         $doc->loadHTML('<?xml encoding="UTF-8">' .  $data['content']);
         libxml_clear_errors();
         libxml_use_internal_errors(false);

diff --git a/src/FetchMeditation/JapaneseJFT.php b/src/FetchMeditation/JapaneseJFT.php
@@ -13,9 +13,9 @@ public function getLanguage(): JFTLanguage
 
     public function fetch(): JFTEntry
     {
-        libxml_use_internal_errors(true);
         $data = HttpUtility::httpGet('https://najapan.org/just_for_today/');
         $doc = new \DOMDocument();
+        libxml_use_internal_errors(true);
         $doc->loadHTML('<?xml encoding="UTF-8">' . $data);
         libxml_clear_errors();
         libxml_use_internal_errors(false);

diff --git a/src/FetchMeditation/PortugueseJFT.php b/src/FetchMeditation/PortugueseJFT.php
@@ -13,10 +13,10 @@ public function getLanguage(): JFTLanguage
 
     public function fetch(): JFTEntry
     {
-        libxml_use_internal_errors(true);
         $data = HttpUtility::httpGet('https://www.na.org.br/meditacao/');
         $doc = new \DOMDocument();
-        $doc->loadHTML($data);
+        libxml_use_internal_errors(true);
+        $doc->loadHTML('<?xml encoding="UTF-8">' . $data);
         libxml_clear_errors();
         libxml_use_internal_errors(false);
         $xpath = new \DOMXPath($doc);

diff --git a/src/FetchMeditation/RussianJFT.php b/src/FetchMeditation/RussianJFT.php
@@ -13,10 +13,10 @@ public function getLanguage(): JFTLanguage
 
     public function fetch(): JFTEntry
     {
-        libxml_use_internal_errors(true);
         $data = HttpUtility::httpGet('https://na-russia.org/eg');
         $doc = new \DOMDocument();
-        $doc->loadHTML('<?xml encoding="UTF-8">' .  $data);
+        libxml_use_internal_errors(true);
+        $doc->loadHTML('<?xml encoding="UTF-8">' . $data);
         libxml_clear_errors();
         libxml_use_internal_errors(false);
         $jftKeys = ['date', 'title', 'quote', 'source', 'content', 'thought', 'page'];

diff --git a/src/FetchMeditation/SpanishJFT.php b/src/FetchMeditation/SpanishJFT.php
@@ -13,11 +13,11 @@ public function getLanguage(): JFTLanguage
 
     public function fetch(): JFTEntry
     {
-        libxml_use_internal_errors(true);
         $timezone = new \DateTimeZone('America/Mexico_City');
         $date = new \DateTime('now', $timezone);
         $data = HttpUtility::httpGet('https://forozonalatino.org/wp-content/uploads/meditaciones/' . $date->format('m/d') . '.html');
         $doc = new \DOMDocument();
+        libxml_use_internal_errors(true);
         $doc->loadHTML('<?xml encoding="ISO-8859-1">' . $data);
         libxml_clear_errors();
         libxml_use_internal_errors(false);

diff --git a/src/FetchMeditation/SwedishJFT.php b/src/FetchMeditation/SwedishJFT.php
@@ -13,9 +13,9 @@ public function getLanguage(): JFTLanguage
 
     public function fetch(): JFTEntry
     {
-        libxml_use_internal_errors(true);
         $data = HttpUtility::httpGet('https://www.nasverige.org/dagens-text/');
         $doc = new \DOMDocument();
+        libxml_use_internal_errors(true);
         $doc->loadHTML('<?xml encoding="UTF-8">' . $data);
         libxml_clear_errors();
         libxml_use_internal_errors(false);

diff --git a/test.php b/test.php
@@ -17,23 +17,23 @@
 
 
 
-//foreach (JFTLanguage::cases() as $shape) {
-//    if ($shape->name == 'French') {
-//        continue;
-//    }
-//    echo "\n\n-=-=-=-=-=-=-=-= JFT - $shape->name -=-=-=-=-=-=-=-=\n\n";
-//    $settings = new JFTSettings($shape);
-//    $jft = JFT::getInstance($settings);
-//    $entry = $jft->fetch();
-//    print_r($entry->quote);
-//    echo "-- " . $jft->getLanguage()->name;
-//}
-//
-//foreach (SPADLanguage::cases() as $shape) {
-//    echo "\n\n-=-=-=-=-=-=-=-= SPAD - $shape->name -=-=-=-=-=-=-=-=\n\n";
-//    $settings = new SPADSettings($shape);
-//    $spad = SPAD::getInstance($settings);
-//    $entry = $spad->fetch();
-//    print_r($entry->quote);
-//    echo "-- " . $spad->getLanguage()->name;
-//}
+foreach (JFTLanguage::cases() as $shape) {
+    if ($shape->name == 'French') {
+        continue;
+    }
+    echo "\n\n-=-=-=-=-=-=-=-= JFT - $shape->name -=-=-=-=-=-=-=-=\n\n";
+    $settings = new JFTSettings($shape);
+    $jft = JFT::getInstance($settings);
+    $entry = $jft->fetch();
+    print_r($entry->quote);
+    echo "-- " . $jft->getLanguage()->name;
+}
+
+foreach (SPADLanguage::cases() as $shape) {
+    echo "\n\n-=-=-=-=-=-=-=-= SPAD - $shape->name -=-=-=-=-=-=-=-=\n\n";
+    $settings = new SPADSettings($shape);
+    $spad = SPAD::getInstance($settings);
+    $entry = $spad->fetch();
+    print_r($entry->quote);
+    echo "-- " . $spad->getLanguage()->name;
+}