Added handling of DOMText and DOMAttr

Imangazaliev · Imangazaliev · commit 0636cfc4bdcd · 2016-03-28T14:13:51.000+03:00
diff --git a/src/DiDom/Document.php b/src/DiDom/Document.php
@@ -277,19 +277,37 @@ public function find($expression, $type = Query::TYPE_CSS, $wrapElement = true)
 
         $xpath    = new DOMXPath($this->document);
         $nodeList = $xpath->query($expression);
-        $elements = array();
+        $result   = array();
 
         if ($wrapElement) {
             foreach ($nodeList as $node) {
-                $elements[] = new Element($node);
+                if ($node instanceof \DOMElement) {
+                    $result[] = new Element($node);
+
+                    continue;
+                }
+
+                if ($node instanceof \DOMText) {
+                    $result[] = $node->data;
+
+                    continue;
+                }
+
+                if ($node instanceof \DOMAttr) {
+                    $result[] = $node->value;
+
+                    continue;
+                }
+
+                throw new RuntimeException(sprintf('Unknown node type "%s"', get_class($node)));
             }
         } else {
             foreach ($nodeList as $node) {
-                $elements[] = $node;
+                $result[] = $node;
             }
         }
 
-        return $elements;
+        return $result;
     }
 
     /**
diff --git a/src/DiDom/Query.php b/src/DiDom/Query.php
@@ -42,6 +42,7 @@ public static function compile($expression, $type = self::TYPE_CSS)
 
             if (array_key_exists($selector, static::$compiled)) {
                 $paths[] = static::$compiled[$selector];
+
                 continue;
             }
 
diff --git a/tests/DiDom/DocumentTest.php b/tests/DiDom/DocumentTest.php
@@ -278,6 +278,34 @@ public function testFindAndReturnDomElement($html, $selector, $type, $count)
         }
     }
 
+    public function testFindText()
+    {
+        $html = $this->loadFixture('menu.html');
+
+        $document = new Document($html, false);
+        $texts = $document->find('//a/text()', Query::TYPE_XPATH);
+
+        $this->assertTrue(is_array($texts));
+        $this->assertEquals(3, count($texts));
+
+        $this->assertEquals(['Link 1', 'Link 2', 'Link 3'], $texts);
+    }
+
+    public function testFindAttribute()
+    {
+        $html = $this->loadFixture('menu.html');
+
+        $document = new Document($html, false);
+        $links = $document->find('//a/@href', Query::TYPE_XPATH);
+
+        $this->assertTrue(is_array($links));
+        $this->assertEquals(3, count($links));
+
+        foreach ($links as $link) {
+            $this->assertEquals('http://example.com', $link);
+        }
+    }
+
     public function findTests()
     {
         $html = $this->loadFixture('posts.html');
diff --git a/tests/fixtures/menu.html b/tests/fixtures/menu.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Document</title>
+</head>
+<body>
+    <ul>
+        <li><a href="http://example.com">Link 1</a></li>
+        <li><a href="http://example.com">Link 2</a></li>
+        <li><a href="http://example.com">Link 3</a></li>
+    </ul>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public static function compile($expression, $type = self::TYPE_CSS)`
`42`	`42`
`43`	`43`	`if (array_key_exists($selector, static::$compiled)) {`
`44`	`44`	`$paths[] = static::$compiled[$selector];`
	`45`	`+`
`45`	`46`	`continue;`
`46`	`47`	`}`
`47`	`48`