Correct loop for hasSingleChildBlockElement. Changed Readability function to match the JS version.

2 files changed, 14 insertions, 7 deletions

diff --git a/src/HTMLParser.php b/src/HTMLParser.php
index 457fd20..0fae247 100644
--- a/src/HTMLParser.php
+++ b/src/HTMLParser.php
@@ -322,11 +322,9 @@ class HTMLParser
                     $node->replaceChild($pNode);
                     $node = $pNode;
                 } elseif (!$this->hasSingleChildBlockElement($node)) {
-
-                    // If there's any info on the node, add it to the elements to score in the next step.
-                    if ($node->getValue(true)) {
-                        $this->elementsToScore[] = $node;
-                    }
+                    // FIXME!!!
+                    $node->setNodeTag('p');
+                    $this->elementsToScore[] = $node;
                 }
             }
 
@@ -615,6 +613,15 @@ class HTMLParser
 
     private function hasSingleChildBlockElement(Readability $node)
     {
-        return (in_array($node->getTagName(), $this->divToPElements)) ? true : $this->hasSingleChildBlockElement($node);
+        /** @var Readability $child */
+        foreach ($node->getChildren() as $child) {
+            if (in_array($child->getTagName(), $this->divToPElements)) {
+                $this->hasSingleChildBlockElement($child);
+            } else {
+                return false;
+            }
+        }
+
+        return true;
     }
 }
diff --git a/src/Readability.php b/src/Readability.php
index 8f7954a..2e2bf01 100644
--- a/src/Readability.php
+++ b/src/Readability.php
@@ -272,7 +272,7 @@ class Readability extends Element implements ReadabilityInterface
      *
      * @param string $value
      */
-    public function setNodeName($value)
+    public function setNodeTag($value)
     {
         $this->node->nodeName = $value;
     }