fix paquettg#103

Author: paquettg

CHANGELOG.md

@@ -8,9 +8,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-- Added support for PSR7 HTTP clients and requests for URL calls.
-- Added PHAN support and fixed all issues from PHAN.
-- Added support for html5 charset detection.
+- Support for PSR7 HTTP clients and requests for URL calls has been added.
+- PHAN support and fixed all issues from PHAN has been added.
+- PHP-CS-Fixer added.
+- Support for html5 charset detection.
+- Added the ability to match both parent and children.
 
 ### Changed
 - Fixed issue with \ causing an infite loop.
@@ -20,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed issue with greedy regex for charset detection.
 
 ### Removed
-- Removed curl interface and curl implementation.
+- Curl interface and curl implementation has been removed.
 
 ## 2.2.0
 

src/PHPHtmlParser/Selector/Seeker.php

@@ -17,14 +17,14 @@ class Seeker implements SeekerInterface
      * Attempts to find all children that match the rule
      * given.
      *
+     * @var InnerNode[] $nodes
      * @throws ChildNotFoundException
      */
     public function seek(array $nodes, RuleDTO $rule, array $options, bool $depthFirst): array
     {
         // XPath index
         if ($rule->getTag() !== null && \is_numeric($rule->getKey())) {
             $count = 0;
-            /** @var AbstractNode $node */
             foreach ($nodes as $node) {
                 if ($rule->getTag() == '*'
                     || $rule->getTag() == $node->getTag()
@@ -44,7 +44,6 @@ public function seek(array $nodes, RuleDTO $rule, array $options, bool $depthFir
         $options = $this->flattenOptions($options);
 
         $return = [];
-        /** @var InnerNode $node */
         foreach ($nodes as $node) {
             // check if we are a leaf
             if ($node instanceof LeafNode || !$node->hasChildren()
@@ -77,24 +76,23 @@ public function seek(array $nodes, RuleDTO $rule, array $options, bool $depthFir
                 if ($pass) {
                     // it passed all checks
                     $return[] = $child;
-                } else {
-                    // this child failed to be matched
-                    if ($child instanceof InnerNode && $child->hasChildren()
-                    ) {
-                        if ($depthFirst) {
-                            if (!isset($options['checkGrandChildren'])
-                                || $options['checkGrandChildren']
-                            ) {
-                                // we have a child that failed but are not leaves.
-                                $matches = $this->seek([$child], $rule, $options, $depthFirst);
-                                foreach ($matches as $match) {
-                                    $return[] = $match;
-                                }
+                }
+                // this child failed to be matched
+                if ($child instanceof InnerNode && $child->hasChildren()
+                ) {
+                    if ($depthFirst) {
+                        if (!isset($options['checkGrandChildren'])
+                            || $options['checkGrandChildren']
+                        ) {
+                            // we have a child that failed but are not leaves.
+                            $matches = $this->seek([$child], $rule, $options, $depthFirst);
+                            foreach ($matches as $match) {
+                                $return[] = $match;
                             }
-                        } else {
-                            // we still want to check its children
-                            $children[] = $child;
                         }
+                    } else {
+                        // we still want to check its children
+                        $children[] = $child;
                     }
                 }
 

tests/DomTest.php

@@ -223,7 +223,7 @@ public function testLoadFileBig()
     {
         $dom = new Dom();
         $dom->loadFromFile('tests/data/files/big.html');
-        $this->assertEquals(10, \count($dom->find('.content-border')));
+        $this->assertEquals(20, \count($dom->find('.content-border')));
     }
 
     public function testLoadFileBigTwice()
@@ -618,4 +618,16 @@ public function testHtml5PageLoad()
         $div = $dom->find('div.d-inline-block', 0);
         $this->assertEquals('max-width: 29px', $div->getAttribute('style'));
     }
+
+    public function testFindAttributeInBothParentAndChild()
+    {
+        $dom = new Dom();
+        $dom->load('<parent attribute="something">
+    <child attribute="anything"></child>
+</parent>');
+
+        /** @var Dom\AbstractNode $meta */
+        $nodes = $dom->find('[attribute]');
+        $this->assertCount(2, $nodes);
+    }
 }