[jakejackson1]

find() treated the nodes already in the match set as candidates for their own selector.
jQuery's .find() searches descendants; filter() is what asks whether the nodes in hand match.

$xml = '<root><a id="a1"><a id="a2"/><b id="b1"/></a></root>';

qp($xml, '#a1')->find('a');   // before: a1, a2    after: a2
qp($xml, '#a1')->find('*');   // before: a1, a2, b1    after: a2, b1

Based on #72 — merge that first. This is not stylistic sequencing; see below.

The document element stays matchable

qp() seeds the match set with the document element, not the document node, so it stands in
for jQuery's $(document). Without an exception for it, qp($xml)->find('root') could never
match — and several long-standing tests, correctly, expect it to. So the self-match is kept for
exactly that one node:

qp($xml)->find('root');    // still 1
qp($xml)->find(':root');   // still 1

Arguably the deeper fix is to seed with the document itself, which would remove the exception
entirely. That is a much larger change and is not attempted here.

Why this needs #72

Before #72, the selector-filtered traversal methods (next(), siblings(), prevAll(), …) test
a candidate with QueryPath::with($node)->is($selector), and is() ran a find(). They were
relying on the self-match to ask "does this node match?" — the very question find() should not
be answering. Applying this change to main alone breaks nine of them:

testHtml5  testBefore  testSiblings  testHTML  testNext
testPrev   testNextAll  testPrevAll  testPrevUntil

Once #72 routes them through NodeMatcher, they stop caring. On top of #72 this change breaks
exactly two tests, covered below.

The tests changed

DOMQueryTest::testBefore searched for the node it was standing on:

qp($file, 'unary')->before('<test/>')->find(':root > test ~ unary')

It now searches from top(), the same shape the next two assertions in that test already use. Its intent is unchanged and still asserted: before() inserted <test/> as a preceding sibling.

DOMQueryTest::testDetachWithSelectorAgreesWithRemove (from #108) asserted that detach($sel) and remove($sel) take the same nodes. detach() uses find() and is now descendants-only. remove() and replaceAll() still use the legacy QueryPathEventHandler, which matches the nodes in hand:

qp($xml, 'p')->remove('p')->count();   // 2
qp($xml, 'p')->detach('p')->count();   // 0

The agreement loop now covers the selectors that can't match the nodes in hand (i, p > i, noSuchElement). Two assertions pin detach('p') and detach('*'). The CHANGELOG says so, and #126 tracks making the legacy engine agree. Once that's fixed, the skipped selectors can go back into the loop.

Merged work

Rebased onto the current #72, which is itself on current main. #50 (:text) is merged. Its broadened wildcard self-match in initialMatchOnElement() was resolved toward this branch. Issue49Test passes unchanged. main had also added a guard that skips non-element nodes to the element and ID matchers; it is kept.

Where the document-element exception lives

Only initialMatchOnElement() needs it, because getElementsByTagName() never returns the node it is called on. The ID and class matchers run an XPath query, and initialXpathQuery() already runs that query from the document when the context is the document element, so the element itself is included. Their self-match branches only ever fired for the document element, so they were redundant and are removed. The element matcher's check now uses the same isSameNode($this->dom->documentElement) test as initialXpathQuery().

Verification

• vendor/bin/phpunit: 564 tests, 1684 assertions, 0 failures (1 skipped)
• composer run lint and composer run lint:min-php: clean, PHP 7.1+
• tests/QueryPath/FindDescendantOnlyTest.php pins the behaviour, the document-element exception, filter() as the replacement, mixed text/comment/element sets, leaf and empty sets, and malformed selectors

🤖 Generated with Claude Code

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 91.02%. Comparing base (6ae6acf) to head (f443f90).
⚠️ Report is 11 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main      #73      +/-   ##
============================================
+ Coverage     90.69%   91.02%   +0.33%     
- Complexity     1424     1430       +6     
============================================
  Files            25       26       +1     
  Lines          3170     3166       -4     
============================================
+ Hits           2875     2882       +7     
+ Misses          295      284      -11     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.