Merge pull request #140 from xificurk/doctrine-orm-3

Doctrine ORM 3.x & DBAL 4.x support

Author: JanTvrdik

composer.json

@@ -9,8 +9,8 @@
 	"require-dev": {
 		"dibi/dibi": "~3.0 | ~4.0 | ~5.0",
 		"doctrine/cache": "~1.11 | ~2.0",
-		"doctrine/dbal": "~2.5 | ~3.0",
-		"doctrine/orm": "~2.5",
+		"doctrine/dbal": "^2.5 || ^3.0 || ^4.0",
+		"doctrine/orm": "^2.9 || ^3.0",
 		"mockery/mockery": "~1.3",
 		"nette/database": "~2.4 | ~3.0",
 		"nette/di": "~2.4.10 | ~3.0",

src/Bridges/DoctrineDbal/DoctrineAdapter.php

@@ -44,30 +44,30 @@ public function exec(string $sql): int
 
 	public function escapeString(string $value): string
 	{
-		return $this->conn->quote($value, 'string');
+		return $this->conn->getDatabasePlatform()->quoteStringLiteral($value);
 	}
 
 
 	public function escapeInt(int $value): string
 	{
-		return $this->conn->quote($value, 'integer');
+		return (string) $value;
 	}
 
 
 	public function escapeBool(bool $value): string
 	{
-		return $this->conn->quote($value, 'boolean');
+		return $this->escapeString((string) (int) $value);
 	}
 
 
 	public function escapeDateTime(DateTimeInterface $value): string
 	{
-		return $this->conn->quote($value, 'datetime');
+		return $this->escapeString($value->format($this->conn->getDatabasePlatform()->getDateTimeFormatString()));
 	}
 
 
 	public function escapeIdentifier(string $value): string
 	{
-		return $this->conn->quoteIdentifier($value);
+		return $this->conn->getDatabasePlatform()->quoteIdentifier($value);
 	}
 }

src/Bridges/DoctrineOrm/StructureDiffGenerator.php

@@ -52,9 +52,9 @@ public function generateContent(): string
 	 */
 	protected function getUpdateQueries(): array
 	{
-		$cache = $this->entityManager->getConfiguration()->getMetadataCacheImpl();
-		if ($cache instanceof ClearableCache) {
-			$cache->deleteAll();
+		$cache = $this->entityManager->getConfiguration()->getMetadataCache();
+		if ($cache !== null) {
+			$cache->clear();
 		}
 
 		$schemaTool = new SchemaTool($this->entityManager);

tests/matrix/dbal/doctrine-4.0.sh

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