doctrine/dbal:3 compatibility (#69)

- adds doctrine/dbal:3 compatibility

Author: janlam7

composer.json

@@ -9,13 +9,13 @@
         "composer-plugin-api":  "^2.0",
         "ext-bcmath":           "*",
         "ext-json":             "*",
-        "doctrine/annotations": "~1.2",
+        "doctrine/annotations": "^1.11.1",
         "doctrine/collections": "^1.6",
-        "doctrine/dbal":        "^2.0",
+        "doctrine/dbal":        "^2.13.2||^3.0.0",
         "doctrine/inflector":   "^1.4.4|^2.0",
         "doctrine/orm":         "~2.4",
         "symfony/filesystem":   "^4.4||^5.0",
-        "twig/twig":            "^2.7.1||^3.0"
+        "twig/twig":            "^2.14.1||^3.0"
     },
     "require-dev": {
         "composer/composer":  "^2.0.0",

src/AnnotationProcessor/DoctrineAnnotationProcessor.php

@@ -6,7 +6,7 @@
 
 namespace Hostnet\Component\AccessorGenerator\AnnotationProcessor;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\JoinColumn;
@@ -27,7 +27,11 @@ class DoctrineAnnotationProcessor implements AnnotationProcessorInterface
     private const ZEROED_DATE_TIME = 'zeroeddatetime';
     private const ZEROED_DATE      = 'zeroeddate';
     private const YAML_ARRAY       = 'yaml_array';
-    private const NULLABLE_TYPES   = [self::ZEROED_DATE, self::ZEROED_DATE_TIME];
+    /**
+     * @deprecated since doctrine/dbal:2.6
+     */
+    private const JSON_ARRAY     = 'json_array';
+    private const NULLABLE_TYPES = [self::ZEROED_DATE, self::ZEROED_DATE_TIME];
 
     /**
      * Process annotations of type:
@@ -156,7 +160,7 @@ private function processBidirectional($annotation, PropertyInformation $informat
     protected function processColumn(Column $column, PropertyInformation $information): void
     {
         $information->setType($this->transformType($column->type));
-        $information->setFixedPointNumber(strtolower($column->type) === Type::DECIMAL);
+        $information->setFixedPointNumber(strtolower($column->type) === Types::DECIMAL);
         $information->setLength($column->length ?: 0);
         $information->setPrecision($column->precision);
         $information->setScale($column->scale);
@@ -214,43 +218,50 @@ private function processJoinColumn(JoinColumn $join_column, PropertyInformation
      */
     private function transformType($type)
     {
-        if ($type === Type::BOOLEAN) {
+        if ($type === Types::BOOLEAN) {
             return 'boolean';
         }
 
-        if ($type === Type::SMALLINT || $type === Type::BIGINT || $type === Type::INTEGER) {
+        if ($type === Types::SMALLINT || $type === Types::BIGINT || $type === Types::INTEGER) {
             return 'integer';
         }
 
-        if ($type === Type::FLOAT) {
+        if ($type === Types::FLOAT) {
             return 'float';
         }
 
-        if ($type === Type::TEXT || $type === Type::GUID || $type === Type::STRING || $type === Type::DECIMAL) {
+        if ($type === Types::TEXT || $type === Types::GUID || $type === Types::STRING || $type === Types::DECIMAL) {
             return 'string';
         }
 
-        if ($type === Type::BLOB /* binary will be added in doctrine 2.5 */) {
+        if ($type === Types::BLOB /* binary will be added in doctrine 2.5 */) {
             return 'resource';
         }
 
         if (\in_array(
             $type,
-            [Type::DATETIME, Type::DATETIMETZ, Type::DATE, Type::TIME, self::ZEROED_DATE_TIME, self::ZEROED_DATE],
+            [
+                Types::DATETIME_MUTABLE,
+                Types::DATETIMETZ_MUTABLE,
+                Types::DATE_MUTABLE,
+                Types::TIME_MUTABLE,
+                self::ZEROED_DATE_TIME,
+                self::ZEROED_DATE,
+            ],
             true
         )) {
             return '\\' . \DateTime::class;
         }
 
         if (\in_array(
             $type,
-            [Type::SIMPLE_ARRAY, Type::JSON_ARRAY, Type::JSON, Type::TARRAY, self::YAML_ARRAY],
+            [Types::SIMPLE_ARRAY, self::JSON_ARRAY, Types::JSON, Types::ARRAY, self::YAML_ARRAY],
             true
         )) {
             return 'array';
         }
 
-        if ($type === Type::OBJECT) {
+        if ($type === Types::OBJECT) {
             return 'object';
         }
 

test/AnnotationProcessor/DoctrineAnnotationProcessorTest.php

@@ -6,7 +6,7 @@
 
 namespace Hostnet\Component\AccessorGenerator\AnnotationProcessor;
 
-use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\GeneratedValue;
 use Doctrine\ORM\Mapping\JoinColumn;
@@ -75,14 +75,14 @@ public function processColumnAnnotationProvider(): iterable
         $explicit->scale = 9;
         $explicit_info->setScale(9);
 
-        $explicit->type = Type::BIGINT;
+        $explicit->type = Types::BIGINT;
         $explicit_info->setType('integer');
         $explicit_info->setIntegerSize(64);
 
         $explicit->unique = true;
         $explicit_info->setUnique(true);
 
-        $faulty->type = Type::DECIMAL;
+        $faulty->type = Types::DECIMAL;
 
         return [
             [$implicit, $implicit_info, null],