Some cleanup renaming

Author: ondrejmirtes

extension.neon

@@ -9,7 +9,7 @@ parameters:
 conditionalTags:
 	PHPStan\Reflection\Doctrine\DoctrineSelectableClassReflectionExtension:
 		phpstan.broker.methodsClassReflectionExtension: %doctrine.allCollectionsSelectable%
-	PHPStan\Type\Doctrine\QueryBuilderGetQueryDynamicReturnTypeExtension:
+	PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderGetQueryDynamicReturnTypeExtension:
 		phpstan.broker.dynamicMethodReturnTypeExtension: %doctrine.queryBuilderGetQueryNotOverride%
 
 services:
@@ -20,7 +20,7 @@ services:
 		tags:
 			- phpstan.broker.methodsClassReflectionExtension
 	-
-		class: PHPStan\Type\Doctrine\CreateQueryBuilderDynamicReturnTypeExtension
+		class: PHPStan\Type\Doctrine\QueryBuilder\CreateQueryBuilderDynamicReturnTypeExtension
 		arguments:
 			queryBuilderClass: %doctrine.queryBuilderClass%
 		tags:
@@ -47,30 +47,30 @@ services:
 			objectManagerLoader: %doctrine.objectManagerLoader%
 			repositoryClass: %doctrine.repositoryClass%
 	-
-		class: PHPStan\Type\Doctrine\QueryBuilderGetDqlDynamicReturnTypeExtension
+		class: PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderGetDqlDynamicReturnTypeExtension
 		arguments:
 			queryBuilderClass: %doctrine.queryBuilderClass%
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 	-
-		class: PHPStan\Type\Doctrine\QueryBuilderGetQueryDynamicReturnTypeExtension
+		class: PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderGetQueryDynamicReturnTypeExtension
 		arguments:
 			queryBuilderClass: %doctrine.queryBuilderClass%
 	-
-		class: PHPStan\Type\Doctrine\QueryBuilderMethodDynamicReturnTypeExtension
+		class: PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderMethodDynamicReturnTypeExtension
 		arguments:
 			queryBuilderClass: %doctrine.queryBuilderClass%
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 
 	-
-		class: PHPStan\Type\Doctrine\QueryBuilderTypeSpecifyingExtension
+		class: PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderTypeSpecifyingExtension
 		arguments:
 			queryBuilderClass: %doctrine.queryBuilderClass%
 		tags:
 			- phpstan.typeSpecifier.methodTypeSpecifyingExtension
 	-
-		class: PHPStan\Type\Doctrine\QueryGetDqlDynamicReturnTypeExtension
+		class: PHPStan\Type\Doctrine\Query\QueryGetDqlDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
 	-

phpstan.neon

@@ -13,4 +13,4 @@ parameters:
 		- '~^Parameter \#1 \$node \(.*\) of method .*Rule::processNode\(\) should be contravariant with parameter \$node \(PhpParser\\Node\) of method PHPStan\\Rules\\Rule::processNode\(\)$~'
 		-
 			message: '~^Variable method call on Doctrine\\ORM\\QueryBuilder\.$~'
-			path: */src/Type/Doctrine/QueryBuilderGetQueryDynamicReturnTypeExtension.php
+			path: */src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php

src/Rules/Doctrine/ORM/QueryBuilderDqlRule.php

@@ -9,7 +9,7 @@
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
-use PHPStan\Type\Doctrine\QueryBuilderType;
+use PHPStan\Type\Doctrine\QueryBuilder\QueryBuilderType;
 use PHPStan\Type\ObjectType;
 
 class QueryBuilderDqlRule implements Rule

src/Type/Doctrine/QueryGetDqlDynamicReturnTypeExtension.php renamed to src/Type/Doctrine/Query/QueryGetDqlDynamicReturnTypeExtension.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace PHPStan\Type\Doctrine;
+namespace PHPStan\Type\Doctrine\Query;
 
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;

src/Type/Doctrine/QueryType.php renamed to src/Type/Doctrine/Query/QueryType.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace PHPStan\Type\Doctrine;
+namespace PHPStan\Type\Doctrine\Query;
 
 use PHPStan\Type\ObjectType;
 

src/Type/Doctrine/CreateQueryBuilderDynamicReturnTypeExtension.php renamed to src/Type/Doctrine/QueryBuilder/CreateQueryBuilderDynamicReturnTypeExtension.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace PHPStan\Type\Doctrine;
+namespace PHPStan\Type\Doctrine\QueryBuilder;
 
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;

src/Type/Doctrine/QueryBuilderGetDqlDynamicReturnTypeExtension.php renamed to src/Type/Doctrine/QueryBuilder/QueryBuilderGetDqlDynamicReturnTypeExtension.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace PHPStan\Type\Doctrine;
+namespace PHPStan\Type\Doctrine\QueryBuilder;
 
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Identifier;

src/Type/Doctrine/QueryBuilderGetQueryDynamicReturnTypeExtension.php renamed to src/Type/Doctrine/QueryBuilder/QueryBuilderGetQueryDynamicReturnTypeExtension.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace PHPStan\Type\Doctrine;
+namespace PHPStan\Type\Doctrine\QueryBuilder;
 
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Identifier;
@@ -10,6 +10,8 @@
 use PHPStan\Rules\Doctrine\ORM\DynamicQueryBuilderArgumentException;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\ConstantScalarType;
+use PHPStan\Type\Doctrine\ObjectMetadataResolver;
+use PHPStan\Type\Doctrine\Query\QueryType;
 use PHPStan\Type\Type;
 use function in_array;
 use function method_exists;

src/Type/Doctrine/QueryBuilderMethodDynamicReturnTypeExtension.php renamed to src/Type/Doctrine/QueryBuilder/QueryBuilderMethodDynamicReturnTypeExtension.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace PHPStan\Type\Doctrine;
+namespace PHPStan\Type\Doctrine\QueryBuilder;
 
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;

src/Type/Doctrine/QueryBuilderType.php renamed to src/Type/Doctrine/QueryBuilder/QueryBuilderType.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace PHPStan\Type\Doctrine;
+namespace PHPStan\Type\Doctrine\QueryBuilder;
 
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\TrinaryLogic;