DoctrineTypeDriverAwareDescriptor: remove interface BC break

Author: janedbal

src/Type/Doctrine/Descriptors/ArrayType.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Type\Doctrine\Descriptors;
 
-use Doctrine\DBAL\Driver;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -25,7 +24,7 @@ public function getWritableToDatabaseType(): Type
 		return new \PHPStan\Type\ArrayType(new MixedType(), new MixedType());
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
 	{
 		return new StringType();
 	}

src/Type/Doctrine/Descriptors/AsciiStringType.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Type\Doctrine\Descriptors;
 
-use Doctrine\DBAL\Driver;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 
@@ -24,7 +23,7 @@ public function getWritableToDatabaseType(): Type
 		return new StringType();
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
 	{
 		return new StringType();
 	}

src/Type/Doctrine/Descriptors/BigIntType.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Type\Doctrine\Descriptors;
 
 use Composer\InstalledVersions;
-use Doctrine\DBAL\Driver;
 use PHPStan\Type\Accessory\AccessoryNumericStringType;
 use PHPStan\Type\IntegerType;
 use PHPStan\Type\StringType;
@@ -34,7 +33,7 @@ public function getWritableToDatabaseType(): Type
 		return TypeCombinator::union(new StringType(), new IntegerType());
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
 	{
 		return new IntegerType();
 	}

src/Type/Doctrine/Descriptors/BinaryType.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Type\Doctrine\Descriptors;
 
-use Doctrine\DBAL\Driver;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ResourceType;
 use PHPStan\Type\StringType;
@@ -26,7 +25,7 @@ public function getWritableToDatabaseType(): Type
 		return new MixedType();
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
 	{
 		return new StringType();
 	}

src/Type/Doctrine/Descriptors/BlobType.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Type\Doctrine\Descriptors;
 
-use Doctrine\DBAL\Driver;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ResourceType;
 use PHPStan\Type\Type;
@@ -25,7 +24,7 @@ public function getWritableToDatabaseType(): Type
 		return new MixedType();
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
 	{
 		return new MixedType();
 	}

src/Type/Doctrine/Descriptors/BooleanType.php

@@ -3,13 +3,17 @@
 namespace PHPStan\Type\Doctrine\Descriptors;
 
 use Doctrine\DBAL\Driver;
+use Doctrine\DBAL\Driver\Mysqli\Driver as MysqliDriver;
+use Doctrine\DBAL\Driver\PDO\MySQL\Driver as PdoMysqlDriver;
 use Doctrine\DBAL\Driver\PDO\PgSQL\Driver as PdoPgSQLDriver;
+use Doctrine\DBAL\Driver\PDO\SQLite\Driver as PdoSQLiteDriver;
 use Doctrine\DBAL\Driver\PgSQL\Driver as PgSQLDriver;
+use Doctrine\DBAL\Driver\SQLite3\Driver as SQLite3Driver;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 
-class BooleanType implements DoctrineTypeDescriptor
+class BooleanType implements DoctrineTypeDescriptor, DoctrineTypeDriverAwareDescriptor
 {
 
 	public function getType(): string
@@ -27,16 +31,35 @@ public function getWritableToDatabaseType(): Type
 		return new \PHPStan\Type\BooleanType();
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
+	{
+		return TypeCombinator::union(
+			new ConstantIntegerType(0),
+			new ConstantIntegerType(1),
+			new \PHPStan\Type\BooleanType()
+		);
+	}
+
+	public function getDatabaseInternalTypeForDriver(Driver $driver): Type
 	{
 		if ($driver instanceof PgSQLDriver || $driver instanceof PdoPgSQLDriver) {
 			return new \PHPStan\Type\BooleanType();
 		}
 
-		return TypeCombinator::union(
-			new ConstantIntegerType(0),
-			new ConstantIntegerType(1)
-		);
+		if (
+			$driver instanceof SQLite3Driver
+			|| $driver instanceof PdoSQLiteDriver
+			|| $driver instanceof MysqliDriver
+			|| $driver instanceof PdoMysqlDriver
+		) {
+			return TypeCombinator::union(
+				new ConstantIntegerType(0),
+				new ConstantIntegerType(1)
+			);
+		}
+
+		// not yet supported driver, return the old implementation guess
+		return $this->getDatabaseInternalType();
 	}
 
 }

src/Type/Doctrine/Descriptors/DateImmutableType.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Type\Doctrine\Descriptors;
 
 use DateTimeImmutable;
-use Doctrine\DBAL\Driver;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -26,7 +25,7 @@ public function getWritableToDatabaseType(): Type
 		return new ObjectType(DateTimeImmutable::class);
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
 	{
 		return new StringType();
 	}

src/Type/Doctrine/Descriptors/DateIntervalType.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Type\Doctrine\Descriptors;
 
 use DateInterval;
-use Doctrine\DBAL\Driver;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -26,7 +25,7 @@ public function getWritableToDatabaseType(): Type
 		return new ObjectType(DateInterval::class);
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
 	{
 		return new StringType();
 	}

src/Type/Doctrine/Descriptors/DateTimeImmutableType.php

@@ -3,7 +3,6 @@
 namespace PHPStan\Type\Doctrine\Descriptors;
 
 use DateTimeImmutable;
-use Doctrine\DBAL\Driver;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -26,7 +25,7 @@ public function getWritableToDatabaseType(): Type
 		return new ObjectType(DateTimeImmutable::class);
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
 	{
 		return new StringType();
 	}

src/Type/Doctrine/Descriptors/DateTimeType.php

@@ -4,7 +4,6 @@
 
 use DateTime;
 use DateTimeInterface;
-use Doctrine\DBAL\Driver;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
@@ -27,7 +26,7 @@ public function getWritableToDatabaseType(): Type
 		return new ObjectType(DateTimeInterface::class);
 	}
 
-	public function getDatabaseInternalType(Driver $driver): Type
+	public function getDatabaseInternalType(): Type
 	{
 		return new StringType();
 	}