Merge pull request #12345 from greg0ire/3.6.x

greg0ire · web-flow · commit 0bd839a720fb · 2026-01-16T18:27:03.000+01:00
Merge 2.20.x up into 3.6.x
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -619,7 +619,7 @@ parameters:
 			path: src/EntityRepository.php
 
 		-
-			message: '#^Method Doctrine\\ORM\\EntityRepository\:\:matching\(\) should return Doctrine\\Common\\Collections\\AbstractLazyCollection\<int, T of object\>&Doctrine\\Common\\Collections\\Selectable\<int, T of object\> but returns Doctrine\\ORM\\LazyCriteriaCollection\<\(int\|string\), object\>\.$#'
+			message: '#^Method Doctrine\\ORM\\EntityRepository\:\:matching\(\) should return Doctrine\\Common\\Collections\\AbstractLazyCollection\<int, T of object\> but returns Doctrine\\ORM\\LazyCriteriaCollection\<\(int\|string\), object\>\.$#'
 			identifier: return.type
 			count: 1
 			path: src/EntityRepository.php

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,7 @@ parameters:`
`619`	`619`	`path: src/EntityRepository.php`
`620`	`620`
`621`	`621`	`-`
`622`		`- message: '#^Method Doctrine\\ORM\\EntityRepository\:\:matching\(\) should return Doctrine\\Common\\Collections\\AbstractLazyCollection\<int, T of object\>&Doctrine\\Common\\Collections\\Selectable\<int, T of object\> but returns Doctrine\\ORM\\LazyCriteriaCollection\<\(int\\|string\), object\>\.$#'`
	`622`	`+ message: '#^Method Doctrine\\ORM\\EntityRepository\:\:matching\(\) should return Doctrine\\Common\\Collections\\AbstractLazyCollection\<int, T of object\> but returns Doctrine\\ORM\\LazyCriteriaCollection\<\(int\\|string\), object\>\.$#'`
`623`	`623`	`identifier: return.type`
`624`	`624`	`count: 1`
`625`	`625`	`path: src/EntityRepository.php`