Merge pull request paquettg#96 from oleg-andreyev/has-attr

Adding `hasAttribute`

Author: paquettg

src/PHPHtmlParser/Dom/AbstractNode.php

@@ -293,6 +293,18 @@ public function getAttribute($key)
         return $attribute;
     }
 
+    /**
+     * A wrapper method that simply calls the hasAttribute method
+     * on the tag of this node.
+     *
+     * @param string $key
+     * @return bool
+     */
+    public function hasAttribute($key)
+    {
+        return $this->tag->hasAttribute($key);
+    }
+
     /**
      * A wrapper method that simply calls the setAttribute method
      * on the tag of this node.

src/PHPHtmlParser/Dom/Tag.php

@@ -225,6 +225,17 @@ public function getAttribute($key)
         return $this->attr[$key];
     }
 
+    /**
+     * Returns TRUE if node has attribute
+     *
+     * @param string $key
+     * @return bool
+     */
+    public function hasAttribute($key)
+    {
+        return isset($this->attr[$key]);
+    }
+
     /**
      * Generates the opening tag for this object.
      *

src/PHPHtmlParser/Selector.php

@@ -232,9 +232,7 @@ protected function seek(array $nodes, array $rule, array $options)
                             $pass = false;
                         }
                     } else {
-                        if ($rule['key'] != 'plaintext' &&
-                            is_null($child->getAttribute($rule['key']))
-                        ) {
+                        if ($rule['key'] != 'plaintext' && !$child->hasAttribute($rule['key'])) {
                             $pass = false;
                         }
                     }

tests/DomTest.php

@@ -201,9 +201,10 @@ public function testLoadFileBigTwicePreserveOption()
         $dom = new Dom;
         $dom->loadFromFile('tests/files/big.html', ['preserveLineBreaks' => true]);
         $post = $dom->find('.post-row', 0);
-        $this->assertEquals('<p>Журчанье воды<br />
-Черно-белые тени<br />
-Вновь на фонтане</p>', trim($post->find('.post-message', 0)->innerHtml));
+        $this->assertEquals(
+            "<p>Журчанье воды<br />\nЧерно-белые тени<br />\nВновь на фонтане</p>",
+            trim($post->find('.post-message', 0)->innerHtml)
+        );
     }
 
     public function testLoadFromUrl()

tests/SelectorTest.php

@@ -203,4 +203,15 @@ public function testFindChildUsingChildSelector()
         $selector = new Selector('div > ul');
         $this->assertEquals(1, count($selector->find($root)));
     }
+
+    public function testFindNodeByAttributeOnly()
+    {
+        $root   = new HtmlNode(new Tag('root'));
+        $child1 = new HtmlNode(new Tag('ul'));
+        $child1->setAttribute('custom-attr', null);
+        $root->addChild($child1);
+
+        $selector = new Selector('[custom-attr]');
+        $this->assertEquals(1, count($selector->find($root)));
+    }
 }