BC

Author: arnaud-lb

src/Type/Doctrine/CreateQueryDynamicReturnTypeExtension.php

@@ -22,9 +22,11 @@
 final class CreateQueryDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
 {
 
-	private ObjectMetadataResolver $objectMetadataResolver;
+	/** @var ObjectMetadataResolver */
+	private $objectMetadataResolver;
 
-	private DescriptorRegistry $descriptorRegistry;
+	/** @var DescriptorRegistry */
+	private $descriptorRegistry;
 
 	public function __construct(ObjectMetadataResolver $objectMetadataResolver, DescriptorRegistry $descriptorRegistry)
 	{
@@ -78,15 +80,15 @@ public function getTypeFromMethodCall(
 
 		return new GenericObjectType(
 			Query::class,
-			[$typeMapping->getResultType()],
+			[$typeMapping->getResultType()]
 		);
 	}
 
 	private function fallbackType(): GenericObjectType
 	{
 		return new GenericObjectType(
 			Query::class,
-			[new MixedType(true)],
+			[new MixedType(true)]
 		);
 	}
 

src/Type/Doctrine/Query/QueryResultDynamicReturnTypeExtension.php

@@ -81,7 +81,7 @@ public function getTypeFromMethodCall(
 
 		return new ArrayType(
 			new IntegerType(),
-			$resultType,
+			$resultType
 		);
 	}
 

src/Type/Doctrine/Query/QueryResultTypeMapping.php

@@ -11,13 +11,14 @@
 final class QueryResultTypeMapping
 {
 
-	private bool $selectQuery = false;
+	/** @var bool */
+	private $selectQuery = false;
 
 	/** @var array<array-key,Type> */
-	private array $entities = [];
+	private $entities = [];
 
 	/** @var array<array-key,Type> */
-	private array $scalars = [];
+	private $scalars = [];
 
 	public function setSelectQuery(): void
 	{

src/Type/Doctrine/Query/QueryResultTypeWalker.php

@@ -79,9 +79,11 @@ class QueryResultTypeWalker extends SqlWalker
 	/** @var array<array-key,bool> */
 	private $nullableQueryComponents;
 
-	private QueryResultTypeMapping $typeMapping;
+	/** @var QueryResultTypeMapping */
+	private $typeMapping;
 
-	private DescriptorRegistry $descriptorRegistry;
+	/** @var DescriptorRegistry */
+	private $descriptorRegistry;
 
 	private bool $isAggregated;
 
@@ -125,7 +127,7 @@ public function __construct($query, $parserResult, array $queryComponents)
 				'Expected the query hint %s to contain a %s, but got a %s',
 				self::HINT_TYPE_MAPPING,
 				QueryResultTypeMapping::class,
-				is_object($typeMapping) ? get_class($typeMapping) : gettype($typeMapping),
+				is_object($typeMapping) ? get_class($typeMapping) : gettype($typeMapping)
 			));
 		}
 
@@ -138,7 +140,7 @@ public function __construct($query, $parserResult, array $queryComponents)
 				'Expected the query hint %s to contain a %s, but got a %s',
 				self::HINT_DESCRIPTOR_REGISTRY,
 				DescriptorRegistry::class,
-				is_object($descriptorRegistry) ? get_class($descriptorRegistry) : gettype($descriptorRegistry),
+				is_object($descriptorRegistry) ? get_class($descriptorRegistry) : gettype($descriptorRegistry)
 			));
 		}
 
@@ -751,7 +753,7 @@ public function walkAggregateExpression($aggExpression)
 			case 'AVG':
 			case 'SUM':
 				$type = $this->unmarshalType(
-					$aggExpression->pathExpression->dispatch($this),
+					$aggExpression->pathExpression->dispatch($this)
 				);
 
 				return $this->marshalType(TypeCombinator::addNull($type));

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -27,9 +27,11 @@
 final class QueryResultTypeWalkerTest extends PHPStanTestCase
 {
 
-	private EntityManagerInterface $em;
+	/** @var EntityManagerInterface */
+	private $em;
 
-	private DescriptorRegistry $descriptorRegistry;
+	/** @var DescriptorRegistry */
+	private $descriptorRegistry;
 
 	public static function getAdditionalConfigFiles(): array
 	{

tests/Type/Doctrine/Query/data/QueryResult/Entities/Many.php

@@ -16,37 +16,51 @@ class Many
 	/**
 	 * @Column(type="bigint")
 	 * @Id
+	 *
+	 * @var string
 	 */
-	public int $id;
+	public $id;
 
 	/**
 	 * @Column(type="integer")
+	 *
+	 * @var int
 	 */
 	public int $intColumn;
 
 	/**
 	 * @Column(type="string")
+	 *
+	 * @var string
 	 */
 	public string $stringColumn;
 
 	/**
 	 * @Column(type="string", nullable=true)
+	 *
+	 * @var string|null
 	 */
-	public ?string $stringNullColumn;
+	public $stringNullColumn;
 
 	/**
 	 * @Column(type="datetime")
+	 *
+	 * @var \DateTime
 	 */
-	public \DateTime $datetimeColumn;
+	public $datetimeColumn;
 
 	/**
 	 * @Column(type="datetime_immutable")
+	 *
+	 * @var \DateTimeImmutable
 	 */
-	public \DateTimeImmutable $datetimeImmutableColumn;
+	public $datetimeImmutableColumn;
 
 	/**
 	 * @ManyToOne(targetEntity="QueryResult\Entities\One", inversedBy="one")
 	 * @JoinColumn(nullable=true)
+	 *
+	 * @var One|null
 	 */
-	public ?One $one;
+	public $one;
 }

tests/Type/Doctrine/Query/data/QueryResult/Entities/ManyId.php

@@ -4,7 +4,8 @@
 
 class ManyId
 {
-    public string $id;
+	/** @var string */
+    public $id;
 
 	public function __construct(string $id)
 	{

tests/Type/Doctrine/Query/data/QueryResult/Entities/One.php

@@ -18,30 +18,38 @@ class One
 	/**
 	 * @Column(type="bitint")
 	 * @Id
+	 *
+	 * @var string
 	 */
-	public int $id;
+	public $id;
 
 	/**
 	 * @Column(type="integer")
 	 * @Id
+	 *
+	 * @var int
 	 */
-	public int $intColumn;
+	public $intColumn;
 
 	/**
 	 * @Column(type="string")
+	 *
+	 * @var string
 	 */
-	public string $stringColumn;
+	public $stringColumn;
 
 	/**
 	 * @Column(type="string", nullable=true)
+	 *
+	 * @var string|null
 	 */
-	public ?string $stringNullColumn;
+	public $stringNullColumn;
 
 	/**
 	 * @OneToMany(targetEntity="QueryResult\Entities\Many", mappedBy="one")
 	 * @JoinColumn(nullable=true)
 	 *
 	 * @var Collection<int,Many>
 	 */
-	public Collection $manies;
+	public $manies;
 }