Fix build

Author: janedbal

src/Type/Doctrine/Descriptors/BigIntType.php

@@ -31,7 +31,7 @@ public function getWritableToPropertyType(): Type
 
 	public function getWritableToDatabaseType(): Type
 	{
-		return TypeCombinator::union(new StringType());
+		return TypeCombinator::union(new StringType(), new IntegerType());
 	}
 
 	public function getDatabaseInternalType(Driver $driver): Type

src/Type/Doctrine/Descriptors/Ramsey/UuidTypeDescriptor.php

@@ -2,8 +2,8 @@
 
 namespace PHPStan\Type\Doctrine\Descriptors\Ramsey;
 
-use PHPStan\Rules\Doctrine\ORM\FakeTestingUuidType;
 use Doctrine\DBAL\Driver;
+use PHPStan\Rules\Doctrine\ORM\FakeTestingUuidType;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\Doctrine\Descriptors\DoctrineTypeDescriptor;
 use PHPStan\Type\ObjectType;

tests/Platform/Entity/PlatformEntity.php

@@ -1,6 +1,6 @@
 <?php declare(strict_types = 1);
 
-namespace Platform\Entity;
+namespace PHPStan\Platform\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 

tests/Platform/QueryResultTypeWalkerFetchTypeMatrixTest.php

@@ -19,6 +19,7 @@
 use mysqli;
 use PDO;
 use PHPStan\Php\PhpVersion;
+use PHPStan\Platform\Entity\PlatformEntity;
 use PHPStan\Testing\PHPStanTestCase;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\BooleanType;
@@ -43,7 +44,6 @@
 use PHPStan\Type\VerbosityLevel;
 use PHPUnit\Framework\Constraint\IsEqual;
 use PHPUnit\Framework\Constraint\IsIdentical;
-use Platform\Entity\PlatformEntity;
 use SQLite3;
 use Throwable;
 use function floor;

tests/Type/Doctrine/Query/QueryResultTypeWalkerTest.php

@@ -70,6 +70,10 @@ public static function getAdditionalConfigFiles(): array
 
 	public static function setUpBeforeClass(): void
 	{
+		if (PHP_VERSION_ID < 80100) {
+			self::markTestSkipped('Test uses asserts without stringification, those work only with PHP >= 8.1. Stringification is tested in platform test.');
+		}
+
 		$em = require __DIR__ . '/../data/QueryResult/entity-manager.php';
 		self::$em = $em;
 
@@ -162,17 +166,15 @@ public static function setUpBeforeClass(): void
 			$em->persist($child);
 		}
 
-		if (property_exists(Column::class, 'enumType') && PHP_VERSION_ID >= 80100) {
-			assert(class_exists(StringEnum::class));
-			assert(class_exists(IntEnum::class));
+		assert(class_exists(StringEnum::class));
+		assert(class_exists(IntEnum::class));
 
-			$entityWithEnum = new EntityWithEnum();
-			$entityWithEnum->id = '1';
-			$entityWithEnum->stringEnumColumn = StringEnum::A;
-			$entityWithEnum->intEnumColumn = IntEnum::A;
-			$entityWithEnum->intEnumOnStringColumn = IntEnum::A;
-			$em->persist($entityWithEnum);
-		}
+		$entityWithEnum = new EntityWithEnum();
+		$entityWithEnum->id = '1';
+		$entityWithEnum->stringEnumColumn = StringEnum::A;
+		$entityWithEnum->intEnumColumn = IntEnum::A;
+		$entityWithEnum->intEnumOnStringColumn = IntEnum::A;
+		$em->persist($entityWithEnum);
 
 		$em->flush();
 	}