fix for more precise matching only-child

Rct567 · Oct 28, 2017 · ff144ca · ff144ca
1 parent a580fcf
commit ff144ca
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/Rct567/DomQuery/DomQuery.php b/src/Rct567/DomQuery/DomQuery.php
@@ -1353,7 +1353,7 @@ function ($matches) {
             'disabled' => '[@disabled]',
             'first-child' => '[not(preceding-sibling::*)]',
             'last-child' => '[not(following-sibling::*)]',
-            'only-child' => '[count(*)=1]',
+            'only-child' => '[not(preceding-sibling::*) and not(following-sibling::*)]',
             'empty' => '[count(*) = 0 and string-length() = 0]',
             'not-empty' => '[count(*) > 0 or string-length() > 0]',
             'parent' => '[count(*) > 0]',

diff --git a/tests/Rct567/DomQuery/Tests/DomQuerySelectorsTest.php b/tests/Rct567/DomQuery/Tests/DomQuerySelectorsTest.php
@@ -335,6 +335,27 @@ public function testLastChildPseudoSelector()
 
         $this->assertEquals(0, $dom->find('div:last-child')->length);
         $this->assertEquals('item 3', $dom->find('li:last-child')->text());
+        $this->assertTrue($dom->find('ul')->is(':last-child'));
+    }
+
+    /*
+     * Test only child pseudo selector
+     */
+    public function testOnlyChildPseudoSelector()
+    {
+        $dom = new DomQuery('<section>
+        <ul id="list-b">
+            <li>nope</li>
+            <span>nope</span>
+        </ul>
+        <ul id="list-b">
+            <li>yep</li>
+        </ul></section>');
+
+        $this->assertEquals(0, $dom->find('span:only-child')->length);
+        $this->assertEquals(0, $dom->find('ul:only-child')->length);
+        $this->assertTrue($dom->is(':only-child'));
+        $this->assertEquals('yep', $dom->find('li:only-child')->text());
     }
 
     /*