fix doctrine/dbal 3.x compatibility (#119)

Author: JanTvrdik

composer.json

@@ -9,7 +9,7 @@
 	"require-dev": {
 		"dibi/dibi": "~3.0 | ~4.0",
 		"doctrine/cache": "~1.5",
-		"doctrine/dbal": "~2.5",
+		"doctrine/dbal": "~2.5 | ~3.0",
 		"doctrine/orm": "~2.5",
 		"mockery/mockery": "~0.9 | ~1.0",
 		"nette/database": "~2.2",

src/Bridges/DoctrineDbal/DoctrineAdapter.php

@@ -28,37 +28,41 @@ public function __construct(Doctrine\DBAL\Connection $conn)
 
 	public function query($sql)
 	{
-		return $this->conn->fetchAll($sql);
+		return method_exists($this->conn, 'fetchAllAssociative')
+			? $this->conn->fetchAllAssociative($sql)
+			: $this->conn->fetchAll($sql);
 	}
 
 
 	public function exec($sql)
 	{
-		return $this->conn->exec($sql);
+		return method_exists($this->conn, 'executeStatement')
+			? $this->conn->executeStatement($sql)
+			: $this->conn->exec($sql);
 	}
 
 
 	public function escapeString($value)
 	{
-		return $this->conn->quote($value, Doctrine\DBAL\Types\Type::STRING);
+		return $this->conn->quote($value, 'string');
 	}
 
 
 	public function escapeInt($value)
 	{
-		return $this->conn->quote($value, Doctrine\DBAL\Types\Type::INTEGER);
+		return $this->conn->quote($value, 'integer');
 	}
 
 
 	public function escapeBool($value)
 	{
-		return $this->conn->quote($value, Doctrine\DBAL\Types\Type::BOOLEAN);
+		return $this->conn->quote($value, 'boolean');
 	}
 
 
 	public function escapeDateTime(DateTime $value)
 	{
-		return $this->conn->quote($value, Doctrine\DBAL\Types\Type::DATETIME);
+		return $this->conn->quote($value, 'datetime');
 	}
 
 

tests/cases/integration/nette-di/MigrationsExtension.diffGenerator.configA.neon

@@ -8,6 +8,6 @@ migrations:
 	diffGenerator: doctrine
 
 services:
-	- Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration([%doctrineDir%], true)
+	- Doctrine\ORM\Tools\Setup::createXMLMetadataConfiguration([%doctrineDir%], true)
 	- Doctrine\DBAL\DriverManager::getConnection(%doctrineConfig%, @Doctrine\ORM\Configuration)
 	- Doctrine\ORM\EntityManager::create(@Doctrine\DBAL\Connection, @Doctrine\ORM\Configuration)

tests/cases/integration/nette-di/MigrationsExtension.diffGenerator.configB.neon

@@ -7,6 +7,6 @@ migrations:
 	driver: mysql
 
 services:
-	- Doctrine\ORM\Tools\Setup::createAnnotationMetadataConfiguration([%doctrineDir%], true)
+	- Doctrine\ORM\Tools\Setup::createXMLMetadataConfiguration([%doctrineDir%], true)
 	- Doctrine\DBAL\DriverManager::getConnection(%doctrineConfig%, @Doctrine\ORM\Configuration)
 	- Doctrine\ORM\EntityManager::create(@Doctrine\DBAL\Connection, @Doctrine\ORM\Configuration)

tests/matrix/dbal/doctrine-3.0.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+PHP_VERSION_MIN="70300"
+PHP_VERSION_MAX="80099"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE doctrine/dbal:~3.0"
+COMPOSER_REQUIRE="$COMPOSER_REQUIRE nette/tester:~2.3"
+DBAL="doctrine"