Try to fix build

Author: LDA

.github/workflows/build.yml

@@ -164,6 +164,8 @@ jobs:
         include:
           - php-version: "8.3"
             update-packages: "composer require --dev doctrine/orm:^3.0 doctrine/dbal:^4.0 carbonphp/carbon-doctrine-types:^3 gedmo/doctrine-extensions:^3 -W"
+          - php-version: "8.4"
+            update-packages: "composer require --dev doctrine/orm:^3.0 doctrine/dbal:^4.0 carbonphp/carbon-doctrine-types:^3 gedmo/doctrine-extensions:^3 symfony/cache:^6.4 symfony/clock:^6.4 symfony/doctrine-bridge:^7.3 symfony/validator:^6.4 -W"
 
     steps:
       - name: "Checkout"

.github/workflows/platform-test.yml

@@ -37,7 +37,7 @@ jobs:
           - php-version: "8.3"
             update-packages: doctrine/orm:^3.0 doctrine/dbal:^4.0 carbonphp/carbon-doctrine-types:^3 gedmo/doctrine-extensions:^3
           - php-version: "8.4"
-            update-packages: doctrine/orm:^3.0 doctrine/dbal:^4.0 carbonphp/carbon-doctrine-types:^3 gedmo/doctrine-extensions:^3
+            update-packages: doctrine/orm:^3.0 doctrine/dbal:^4.0 carbonphp/carbon-doctrine-types:^3 gedmo/doctrine-extensions:^3 symfony/cache:^6.4 symfony/clock:^6.4 symfony/doctrine-bridge:^7.3 symfony/validator:^6.4
 
     steps:
       - name: "Checkout"

compatibility/without-symfony-bridge-baseline.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+
+use Composer\InstalledVersions;
+
+$includes = [];
+
+if (!InstalledVersions::isInstalled('symfony/doctrine-bridge')) {
+	$includes[] = __DIR__ . '/../phpstan-baseline-without-symfony-bridge.neon';
+}
+
+$config = [];
+$config['includes'] = $includes;
+
+return $config;

composer.json

@@ -36,10 +36,7 @@
 		"phpstan/phpstan-strict-rules": "^2.0",
 		"phpunit/phpunit": "^9.6.20",
 		"ramsey/uuid": "^4.2",
-		"symfony/cache": "^6.4",
-		"symfony/clock": "^6.4",
-		"symfony/doctrine-bridge": "^7.3",
-		"symfony/validator": "^6.4"
+		"symfony/cache": "^5.4"
 	},
 	"config": {
 		"sort-packages": true,

extension.neon

@@ -413,7 +413,7 @@ services:
 		arguments:
 			uuidTypeName: Ramsey\Uuid\Doctrine\UuidBinaryOrderedTimeType
 	-
-		class: PHPStan\Type\Doctrine\Descriptors\Symfony\DatePointType
+		class: PHPStan\Type\Doctrine\Descriptors\Symfony\DatePointTypeDescriptor
 		tags: [phpstan.doctrine.typeDescriptor]
 
 	# Doctrine Collection

phpstan-baseline-without-symfony-bridge.neon

@@ -0,0 +1,25 @@
+parameters:
+	ignoreErrors:
+		-
+			message: '#^Class Symfony\\Bridge\\Doctrine\\Types\\DatePointType not found\.$#'
+			identifier: class.notFound
+			count: 1
+			path: src/Type/Doctrine/Descriptors/Symfony/DatePointTypeDescriptor.php
+
+		-
+			message: '#^Class Symfony\\Component\\Clock\\DatePoint not found\.$#'
+			identifier: class.notFound
+			count: 2
+			path: src/Type/Doctrine/Descriptors/Symfony/DatePointTypeDescriptor.php
+
+		-
+			message: '#^Method PHPStan\\Type\\Doctrine\\Descriptors\\Symfony\\DatePointTypeDescriptor\:\:getType\(\) should return class\-string\<Doctrine\\DBAL\\Types\\Type\> but returns string\.$#'
+			identifier: return.type
+			count: 1
+			path: src/Type/Doctrine/Descriptors/Symfony/DatePointTypeDescriptor.php
+
+		-
+			message: '#^Parameter \#2 \$className of static method Doctrine\\DBAL\\Types\\Type\:\:addType\(\) expects class\-string\<Doctrine\\DBAL\\Types\\Type\>, string given\.$#'
+			identifier: argument.type
+			count: 1
+			path: tests/Rules/Doctrine/ORM/EntityColumnRuleTest.php

phpstan.neon

@@ -5,6 +5,7 @@ includes:
 	- phpstan-baseline-deprecations.neon
 	- phpstan-baseline-dbal-3.neon
 	- compatibility/orm-3-baseline.php
+	- compatibility/without-symfony-bridge-baseline.php
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
 	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon

src/Type/Doctrine/Descriptors/Symfony/DatePointType.php renamed to src/Type/Doctrine/Descriptors/Symfony/DatePointTypeDescriptor.php

@@ -6,14 +6,15 @@
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
+use Symfony\Bridge\Doctrine\Types\DatePointType;
 use Symfony\Component\Clock\DatePoint;
 
-class DatePointType implements DoctrineTypeDescriptor
+class DatePointTypeDescriptor implements DoctrineTypeDescriptor
 {
 
 	public function getType(): string
 	{
-		return \Symfony\Bridge\Doctrine\Types\DatePointType::class;
+		return DatePointType::class;
 	}
 
 	public function getWritableToPropertyType(): Type

tests/Rules/Doctrine/ORM/EntityColumnRuleTest.php

@@ -24,10 +24,11 @@
 use PHPStan\Type\Doctrine\Descriptors\ReflectionDescriptor;
 use PHPStan\Type\Doctrine\Descriptors\SimpleArrayType;
 use PHPStan\Type\Doctrine\Descriptors\StringType;
-use PHPStan\Type\Doctrine\Descriptors\Symfony\DatePointType;
+use PHPStan\Type\Doctrine\Descriptors\Symfony\DatePointTypeDescriptor;
 use PHPStan\Type\Doctrine\ObjectMetadataResolver;
-use Symfony\Component\Clock\DatePoint;
+use Symfony\Bridge\Doctrine\Types\DatePointType;
 use function array_unshift;
+use function class_exists;
 use function strpos;
 use const PHP_VERSION_ID;
 
@@ -61,8 +62,8 @@ protected function getRule(): Rule
 		if (!Type::hasType('array')) {
 			Type::addType('array', \Doctrine\DBAL\Types\ArrayType::class);
 		}
-		if (!Type::hasType('date_point')) {
-			Type::addType('date_point', \Symfony\Bridge\Doctrine\Types\DatePointType::class);
+		if (!Type::hasType('date_point') && class_exists(DatePointType::class)) {
+			Type::addType('date_point', DatePointType::class);
 		}
 
 		return new EntityColumnRule(
@@ -84,7 +85,7 @@ protected function getRule(): Rule
 				new ReflectionDescriptor(CarbonType::class, $this->createReflectionProvider(), self::getContainer()),
 				new ReflectionDescriptor(CustomType::class, $this->createReflectionProvider(), self::getContainer()),
 				new ReflectionDescriptor(CustomNumericType::class, $this->createReflectionProvider(), self::getContainer()),
-				new DatePointType(),
+				new DatePointTypeDescriptor(),
 			]),
 			$this->createReflectionProvider(),
 			true,
@@ -172,14 +173,6 @@ public function testRule(?string $objectManagerLoader): void
 				'Property PHPStan\Rules\Doctrine\ORM\MyBrokenEntity::$invalidSimpleArray type mapping mismatch: property can contain array<int> but database expects array<string>.',
 				162,
 			],
-			[
-				'Property PHPStan\Rules\Doctrine\ORM\MyBrokenEntity::$invalidDatePoint type mapping mismatch: database can contain Symfony\Component\Clock\DatePoint but property expects DateTime.',
-				175,
-			],
-			[
-				'Property PHPStan\Rules\Doctrine\ORM\MyBrokenEntity::$invalidDatePoint type mapping mismatch: property can contain DateTime but database expects Symfony\Component\Clock\DatePoint.',
-				175,
-			],
 		];
 
 		$dbalVersion = InstalledVersions::getVersion('doctrine/dbal');
@@ -194,6 +187,33 @@ public function testRule(?string $objectManagerLoader): void
 		$this->analyse([__DIR__ . '/data/MyBrokenEntity.php'], $errors);
 	}
 
+
+	/**
+	 * @dataProvider dataObjectManagerLoader
+	 */
+	public function testRuleSymfony(?string $objectManagerLoader): void
+	{
+		if (!InstalledVersions::isInstalled('symfony/doctrine-bridge')) {
+			self::markTestSkipped('symfony/doctrine-bridge');
+		}
+
+		$this->allowNullablePropertyForRequiredField = false;
+		$this->objectManagerLoader = $objectManagerLoader;
+
+		$errors = [
+			[
+				'Property PHPStan\Rules\Doctrine\ORM\MyBrokenEntity::$invalidDatePoint type mapping mismatch: database can contain Symfony\Component\Clock\DatePoint but property expects DateTime.',
+				175,
+			],
+			[
+				'Property PHPStan\Rules\Doctrine\ORM\MyBrokenEntity::$invalidDatePoint type mapping mismatch: property can contain DateTime but database expects Symfony\Component\Clock\DatePoint.',
+				175,
+			],
+		];
+
+		$this->analyse([__DIR__ . '/data/MySymfonyBrokenEntity.php'], $errors);
+	}
+
 	/**
 	 * @dataProvider dataObjectManagerLoader
 	 */
@@ -251,14 +271,6 @@ public function testRuleWithAllowedNullableProperty(?string $objectManagerLoader
 				'Property PHPStan\Rules\Doctrine\ORM\MyBrokenEntity::$invalidSimpleArray type mapping mismatch: property can contain array<int> but database expects array<string>.',
 				162,
 			],
-			[
-				'Property PHPStan\Rules\Doctrine\ORM\MyBrokenEntity::$invalidDatePoint type mapping mismatch: database can contain Symfony\Component\Clock\DatePoint but property expects DateTime.',
-				175,
-			],
-			[
-				'Property PHPStan\Rules\Doctrine\ORM\MyBrokenEntity::$invalidDatePoint type mapping mismatch: property can contain DateTime but database expects Symfony\Component\Clock\DatePoint.',
-				175,
-			],
 		];
 
 		$dbalVersion = InstalledVersions::getVersion('doctrine/dbal');

tests/Rules/Doctrine/ORM/data/MyBrokenEntity.php

@@ -167,17 +167,4 @@ class MyBrokenEntity extends MyBrokenSuperclass
 	 */
 	private $validSimpleArray;
 
-
-	/**
-	 * @ORM\Column(type="date_point")
-	 * @var \DateTime
-	 */
-	private $invalidDatePoint;
-
-	/**
-	 * @ORM\Column(type="date_point")
-	 * @var \Symfony\Component\Clock\DatePoint
-	 */
-	private $validDatePoint;
-
 }

tests/Rules/Doctrine/ORM/data/MySymfonyBrokenEntity.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Rules\Doctrine\ORM;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Entity()
+ */
+class MyBrokenEntity
+{
+	/**
+	 * @ORM\Column(type="date_point")
+	 * @var \DateTime
+	 */
+	private $invalidDatePoint;
+
+	/**
+	 * @ORM\Column(type="date_point")
+	 * @var \Symfony\Component\Clock\DatePoint
+	 */
+	private $validDatePoint;
+
+}