Merge 2.5.x into 2.6.x

[alcaeus]

Should've done this before creating new pipeline stages, that would've helped avoid a nasty conflict resolution. Oh well 🤷‍♂️

[alcaeus]

Not sure I understand the psalm failures, @franmomu could you please take a look?

[franmomu]

The thing about Builder::getPipeline() is that it returns PipelineExpression

mongodb-odm/lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php

Line 274 in 3091159

* @psalm-return PipelineExpression

which is list<StageExpression>:

mongodb-odm/lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php

Line 33 in 3091159

* @psalm-type PipelineExpression = list<StageExpression>

and StageExpression:

mongodb-odm/lib/Doctrine/ODM/MongoDB/Aggregation/Stage.php

Line 18 in 3091159

* @psalm-type StageExpression = non-empty-array<non-empty-string, mixed>|object

so in Builder::getPipeline()

mongodb-odm/lib/Doctrine/ODM/MongoDB/Aggregation/Builder.php

Lines 289 to 292 in 3091159

	$pipeline = array_map(
	static fn (Stage $stage) => $stage->getExpression(),
	$this->stages,
	);

$stage->getExpression() should return StageExpression or non-empty-array<non-empty-string, mixed>, if that's the case, in

mongodb-odm/lib/Doctrine/ODM/MongoDB/Aggregation/Stage/GraphLookup/MatchStage.php

Lines 19 to 22 in 3091159

	public function getExpression(): array
	{
	return $this->query->getQuery();
	}

should return a non-empty-array, but Expr::getExpression() returns array<string, mixed>

mongodb-odm/lib/Doctrine/ODM/MongoDB/Aggregation/Expr.php

Lines 515 to 519 in 3091159

	/** @return array<string, mixed> */
	public function getExpression(): array
	{
	return $this->expr;
	}

[alcaeus]

Closing in favour of #2527 where I've also fixed the issue above. Thanks for your help @franmomu!