Added support for doctrine/orm version 2

Author: fabiang

.envrc

@@ -13,6 +13,7 @@ export MYSQL_PASSWORD=test
 export MYSQL_DATABASE=testdb
 export MYSQL_VERSION=5.7
 export MYSQL_CHARSET=utf8
+export MYSQL_SERVER_VERSION=${MYSQL_VERSION}.0
 
 export MARIADB_DRIVER=pdo_mysql
 export MARIADB_HOST=127.0.0.1
@@ -22,6 +23,7 @@ export MARIADB_PASSWORD=test
 export MARIADB_DATABASE=testdb
 export MARIADB_VERSION=11
 export MARIADB_CHARSET=utf8
+export MARIADB_SERVER_VERSION=${MYSQL_VERSION}.0
 
 export MSSQL_DRIVER=pdo_sqlsrv
 export MSSQL_VERSION=2022

.github/workflows/ci.yml

@@ -88,6 +88,7 @@ jobs:
     strategy:
       matrix:
         mssql: ["2022"]
+        composer_args: ["", "--prefer-lowest"]
 
     steps:
     - uses: actions/checkout@v6
@@ -114,7 +115,7 @@ jobs:
           ${{ runner.os }}-php-
 
     - name: Install dependencies
-      run: composer update --prefer-dist --no-progress --ignore-platform-reqs
+      run: composer update --prefer-dist --no-progress --ignore-platform-reqs ${{ matrix.composer_args }}
 
     - name: Start containers
       run: docker compose -f "docker-compose.yml" up -d --build mssql
@@ -160,10 +161,12 @@ jobs:
       MYSQL_PASSWORD: test
       MYSQL_DATABASE: testdb
       MYSQL_CHARSET: utf8
+      MYSQL_SERVER_VERSION: ${{ matrix.mysql }}.0
 
     strategy:
       matrix:
         mysql: ["9.5", "8.4", "5.7"]
+        composer_args: ["", "--prefer-lowest"]
 
     steps:
     - uses: actions/checkout@v6
@@ -183,7 +186,7 @@ jobs:
           ${{ runner.os }}-php-
 
     - name: Install dependencies
-      run: composer update --prefer-dist --no-progress --ignore-platform-reqs
+      run: composer update --prefer-dist --no-progress --ignore-platform-reqs ${{ matrix.composer_args }}
 
     - name: Start containers
       run: docker compose -f "docker-compose.yml" up -d --build mysql
@@ -229,10 +232,12 @@ jobs:
       MARIADB_PASSWORD: test
       MARIADB_DATABASE: testdb
       MARIADB_CHARSET: utf8
+      MARIADB_SERVER_VERSION: 5.7.0
 
     strategy:
       matrix:
         mariadb: ["12", "11"]
+        composer_args: ["", "--prefer-lowest"]
 
     steps:
     - uses: actions/checkout@v6
@@ -252,7 +257,7 @@ jobs:
           ${{ runner.os }}-php-
 
     - name: Install dependencies
-      run: composer update --prefer-dist --no-progress --ignore-platform-reqs
+      run: composer update --prefer-dist --no-progress --ignore-platform-reqs ${{ matrix.composer_args }}
 
     - name: Start containers
       run: docker compose -f "docker-compose.yml" up -d --build mariadb
@@ -301,6 +306,7 @@ jobs:
     strategy:
       matrix:
         postgres: ["18", "17", "16", "15", "14"]
+        composer_args: ["", "--prefer-lowest"]
 
     steps:
     - uses: actions/checkout@v6
@@ -320,7 +326,7 @@ jobs:
           ${{ runner.os }}-php-
 
     - name: Install dependencies
-      run: composer update --prefer-dist --no-progress --ignore-platform-reqs
+      run: composer update --prefer-dist --no-progress --ignore-platform-reqs ${{ matrix.composer_args }}
 
     - name: Start containers
       run: docker compose -f "docker-compose.yml" up -d --build postgresql

behat.php

@@ -22,7 +22,7 @@
             'user'          => getenv('MYSQL_USER'),
             'password'      => getenv('MYSQL_PASSWORD'),
             'charset'       => getenv('MYSQL_CHARSET'),
-            'serverVersion' => getenv('MYSQL_SERVER_VERSION'), 
+            'serverVersion' => getenv('MYSQL_SERVER_VERSION'),
         ])
         ->addContext(MariaDBContext::class, [
             'driver'        => getenv('MARIADB_DRIVER'),
@@ -32,7 +32,7 @@
             'user'          => getenv('MARIADB_USER'),
             'password'      => getenv('MARIADB_PASSWORD'),
             'charset'       => getenv('MARIADB_CHARSET'),
-            'serverVersion' => getenv('MARIADB_SERVER_VERSION'), 
+            'serverVersion' => getenv('MARIADB_SERVER_VERSION'),
         ])
         ->addContext(PostgreSQLContext::class, [
             'driver'   => getenv('POSTGRES_DRIVER'),

composer.json

@@ -20,14 +20,17 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Fabiang\\Doctrine\\Migrations\\Liquibase\\": "tests/features/bootstrap",
-            "Fabiang\\Doctrine\\Migrations\\Liquibase\\Entity\\": "tests/features/Entitiy"
+            "Fabiang\\Doctrine\\Migrations\\Liquibase\\": [
+                "tests/features/bootstrap",
+                "tests/units/src"
+            ],
+            "Fabiang\\Doctrine\\Migrations\\Liquibase\\Entity\\": "tests/features/Entity"
         }
     },
     "require": {
         "php": "~8.3.0 || ~8.4.0",
-        "doctrine/orm": "^3.0",
-        "doctrine/dbal": "^4.3"
+        "doctrine/orm": "^2.20 || ^3.0",
+        "doctrine/dbal": "^3.10 || ^4.3"
     },
     "require-dev": {
         "phpunit/phpunit": "^12.4",

src/Helper/VersionHelper.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Fabiang\Doctrine\Migrations\Liquibase\Helper;
+
+use Composer\InstalledVersions;
+use Composer\Semver\VersionParser;
+
+final class VersionHelper
+{
+    private static ?bool $dbalVersion4 = null;
+
+    public static function isDBALVersion4(): bool
+    {
+        if (static::$dbalVersion4 === null) {
+            static::$dbalVersion4 = InstalledVersions::satisfies(new VersionParser(), 'doctrine/dbal', '^4.0');
+        }
+
+        return static::$dbalVersion4;
+    }
+}

src/LiquibaseSchemaTool.php

@@ -5,6 +5,7 @@
 namespace Fabiang\Doctrine\Migrations\Liquibase;
 
 use Doctrine\DBAL\Schema\Comparator;
+use Doctrine\DBAL\Schema\ForeignKeyConstraint;
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\DBAL\Schema\SchemaDiff;
 use Doctrine\ORM\EntityManagerInterface;
@@ -130,7 +131,13 @@ public function diffChangeLogFromSchemaDiff(
             $soutput->alterTable($tableDiff);
 
             foreach ($tableDiff->getDroppedForeignKeys() as $foreignKey) {
-                $soutput->dropForeignKey($foreignKey, $tableDiff->getOldTable());
+                $oldTable = $tableDiff->getOldTable();
+                /**
+                 * @psalm-suppress RedundantCondition
+                 */
+                if ($foreignKey instanceof ForeignKeyConstraint && $oldTable !== null) {
+                    $soutput->dropForeignKey($foreignKey, $oldTable);
+                }
             }
         }