Add support for using $text operator in a aggregation with a filter

[GromNaN]

Q	A
Type	bug
BC Break	no
Fixed issues	Fix #2733

Summary

The $text operator must be in the first $match stage. Instead of prepending the pipeline with an other $match stage for the filter, the builder merge them using a logical $and.

We cannot detect when $text is used as this can be deep in the $match query, so the behavior is for all the pipelines.

[jmikola]

Starting a separate comment thread for this. Apologies for not asking this sooner, but do you know why the $geoNear stage is able to use:

$this->applyFilters($pipeline[0]['$geoNear']['query']);

Since that merges the filter and discriminator criteria into the query, I'm curious as to why we could do the following instead of $and:

$pipeline[0]['$match'] = $this->applyFilters($pipeline[0]['$match']);

[GromNaN]

Excellent point, I probably didn't go far enough in my exploration. In fact, CriteriaMerger already does the job very well.

mongodb-odm/lib/Doctrine/ODM/MongoDB/Query/CriteriaMerger.php

Lines 27 to 41 in fd0ad45

	public function merge(...$criterias): array
	{
	$nonEmptyCriterias = array_values(array_filter($criterias, static fn (array $criteria) => ! empty($criteria)));
	switch (count($nonEmptyCriterias)) {
	case 0:
	return [];
	case 1:
	return $nonEmptyCriterias[0];
	default:
	return ['$and' => $nonEmptyCriterias];
	}
	}

I modifies the implementation to match with $geoNear. Good news, I didn't have to touch the tests and it cleanly drops empty $match criteria.

[GromNaN]

It's getting bigger than expected, but that's no bad thing.

[GromNaN]

This was an error: $geoNear.query does not accept an empty array

MongoServerError[TypeMismatch]: query must be an object

[jmikola]

Does this suggest that the geoNear() builder method never worked in previous versions when query criteria was omitted? That seems like something worthy of its own ticket for changelog visibility, even if you want to keep the fix in this PR.

[GromNaN]

Explicitly fixed in #2743.

[GromNaN]

I have to juggle between array and empty stdClass to ensure that we have a map when converting to BSON.

[GromNaN]

This is more efficient and more resilient if we introduce changes on the $pipeline array like #2740.

[jmikola]

You can decide if it's worth reporting a separate issue for the outstanding geoNear() bug.

[jmikola]

Does this suggest that the geoNear() builder method never worked in previous versions when query criteria was omitted? That seems like something worthy of its own ticket for changelog visibility, even if you want to keep the fix in this PR.

[jmikola]

The query here seems odd, but I understand that's because addDiscriminatorToPreparedQuery() sets the key directly and addFilterToPreparedQuery() uses CriteriaMerger, which will always adds $and for 2+ criteria.