Merge branch '1.3.x' into 1.4.x

Author: ondrejmirtes

src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php

@@ -36,15 +36,20 @@ class QueryBuilderGetQueryDynamicReturnTypeExtension implements DynamicMethodRet
 	 * Those are critical methods where we need to understand arguments passed to them, the rest is allowed to be more dynamic
 	 * - this list reflects what is implemented in QueryResultTypeWalker
 	 */
-	private const METHODS_AFFECTING_RESULT_TYPE = [
-		'add',
-		'select',
-		'addselect',
-		'from',
-		'join',
-		'innerjoin',
-		'leftjoin',
-		'indexby',
+	private const METHODS_NOT_AFFECTING_RESULT_TYPE = [
+		'where',
+		'andwhere',
+		'orwhere',
+		'setparameter',
+		'setparameters',
+		'addcriteria',
+		'addorderby',
+		'orderby',
+		'addgroupby',
+		'groupby',
+		'having',
+		'andhaving',
+		'orhaving',
 	];
 
 	/** @var ObjectMetadataResolver */
@@ -154,7 +159,7 @@ public function getTypeFromMethodCall(
 				try {
 					$args = $this->argumentsProcessor->processArgs($scope, $methodName, $calledMethodCall->getArgs());
 				} catch (DynamicQueryBuilderArgumentException $e) {
-					if (!in_array($lowerMethodName, self::METHODS_AFFECTING_RESULT_TYPE, true)) {
+					if (in_array($lowerMethodName, self::METHODS_NOT_AFFECTING_RESULT_TYPE, true)) {
 						continue;
 					}
 					return $defaultReturnType;