Actually using the LockFileSchemaManager

Author: moufmouf

phpunit.mariadb.xml

@@ -25,12 +25,13 @@
         <var name="db_port" value="3306"/>
         <var name="db_driver" value="pdo_mysql"/>
     </php>
-    
+
     <filter>
   		<whitelist processUncoveredFilesFromWhitelist="true">
     		<directory suffix=".php">src/</directory>
     		<exclude>
                 <directory suffix=".php">src/Test</directory>
+                <file>src/Schema/LockFileSchemaManager.php</file>
     		</exclude>
   		</whitelist>
 	</filter>

phpunit.mysql8.xml

@@ -25,12 +25,13 @@
         <var name="db_port" value="3306"/>
         <var name="db_driver" value="pdo_mysql"/>
     </php>
-    
+
     <filter>
   		<whitelist processUncoveredFilesFromWhitelist="true">
     		<directory suffix=".php">src/</directory>
     		<exclude>
                 <directory suffix=".php">src/Test</directory>
+                <file>src/Schema/LockFileSchemaManager.php</file>
     		</exclude>
   		</whitelist>
 	</filter>

phpunit.oracle.xml

@@ -26,12 +26,13 @@
         <var name="db_port" value="1521"/>
         <var name="db_driver" value="oci8"/>
     </php>
-    
+
     <filter>
   		<whitelist processUncoveredFilesFromWhitelist="true">
     		<directory suffix=".php">src/</directory>
     		<exclude>
                 <directory suffix=".php">src/Test</directory>
+                <file>src/Schema/LockFileSchemaManager.php</file>
     		</exclude>
   		</whitelist>
 	</filter>

phpunit.postgres.xml

@@ -25,12 +25,13 @@
         <var name="db_port" value="5432"/>
         <var name="db_driver" value="pdo_pgsql"/>
     </php>
-    
+
     <filter>
   		<whitelist processUncoveredFilesFromWhitelist="true">
     		<directory suffix=".php">src/</directory>
     		<exclude>
                 <directory suffix=".php">src/Test</directory>
+                <file>src/Schema/LockFileSchemaManager.php</file>
     		</exclude>
   		</whitelist>
 	</filter>

phpunit.xml.dist

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit backupGlobals="false"
+<phpunit
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
          colors="true"
          convertErrorsToExceptions="true"
@@ -25,12 +28,13 @@
         <var name="db_port" value="3306"/>
         <var name="db_driver" value="pdo_mysql"/>
     </php>
-    
+
     <filter>
   		<whitelist processUncoveredFilesFromWhitelist="true">
     		<directory suffix=".php">src/</directory>
     		<exclude>
                 <directory suffix=".php">src/Test</directory>
+                <file>src/Schema/LockFileSchemaManager.php</file>
     		</exclude>
   		</whitelist>
 	</filter>

src/Configuration.php

@@ -8,6 +8,7 @@
 use Doctrine\Common\Cache\VoidCache;
 use Doctrine\DBAL\Connection;
 use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer;
+use TheCodingMachine\TDBM\Schema\LockFileSchemaManager;
 use TheCodingMachine\TDBM\Utils\Annotation\AnnotationParser;
 use TheCodingMachine\TDBM\Utils\Annotation\Autoincrement;
 use TheCodingMachine\TDBM\Utils\Annotation\UUID;
@@ -118,7 +119,9 @@ public function __construct(
         } else {
             $this->cache = new VoidCache();
         }
-        $lockFileSchemaManager = $this->connection->getSchemaManager();
+        $this->lockFilePath = $lockFilePath;
+        $schemaLockFileDumper = new SchemaLockFileDumper($this->connection, $this->cache, $this->getLockFilePath());
+        $lockFileSchemaManager = new LockFileSchemaManager($this->connection->getSchemaManager(), $schemaLockFileDumper);
         if ($schemaAnalyzer !== null) {
             $this->schemaAnalyzer = $schemaAnalyzer;
         } else {
@@ -130,7 +133,6 @@ public function __construct(
         $this->annotationParser = $annotationParser ?: AnnotationParser::buildWithDefaultAnnotations([]);
         $this->codeGeneratorListener = new CodeGeneratorEventDispatcher($codeGeneratorListeners);
         $this->namingStrategy = $namingStrategy ?: new DefaultNamingStrategy($this->annotationParser, $lockFileSchemaManager);
-        $this->lockFilePath = $lockFilePath;
     }
 
     /**

tests/Commands/AlteredConfigurationTest.php

@@ -5,6 +5,7 @@
 
 use Doctrine\Common\Cache\Cache;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Schema\AbstractSchemaManager;
 use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer;
 use PHPUnit\Framework\TestCase;
 use TheCodingMachine\TDBM\Configuration;
@@ -17,6 +18,7 @@ class AlteredConfigurationTest extends TestCase
     public function testAlteredConfiguration(): void
     {
         $connection = $this->getMockBuilder(Connection::class)->disableOriginalConstructor()->getMock();
+        $connection->method('getSchemaManager')->willReturn($this->createMock(AbstractSchemaManager::class));
         $namingStrategy = $this->getMockBuilder(NamingStrategyInterface::class)->disableOriginalConstructor()->getMock();
         $cache = $this->getMockBuilder(Cache::class)->disableOriginalConstructor()->getMock();
         $logger = $this->getMockBuilder(LoggerInterface::class)->disableOriginalConstructor()->getMock();

tests/TDBMSchemaAnalyzerTest.php

@@ -42,30 +42,18 @@ protected function setUp(): void
 
     public function testGetIncomingForeignKeys(): void
     {
-        /*$schemaAnalyzer = new SchemaAnalyzer(self::getConnection()->getSchemaManager(), new ArrayCache(), 'prefix_');
-        $cache = new ArrayCache();
-        $tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer(self::getConnection(), $cache, $schemaAnalyzer, Configuration::getDefaultLockFilePath());*/
-
         $fks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys('users');
         $this->assertCount(1, $fks);
     }
 
     public function testGetIncomingForeignKeys2(): void
     {
-        /*$schemaAnalyzer = new SchemaAnalyzer(self::getConnection()->getSchemaManager(), new ArrayCache(), 'prefix_');
-        $cache = new ArrayCache();
-        $tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer(self::getConnection(), $cache, $schemaAnalyzer, Configuration::getDefaultLockFilePath());*/
-
         $fks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys('contact');
         $this->assertCount(1, $fks);
     }
 
     public function testGetIncomingForeignKeys3(): void
     {
-        /*$schemaAnalyzer = new SchemaAnalyzer(self::getConnection()->getSchemaManager(), new ArrayCache(), 'prefix_');
-        $cache = new ArrayCache();
-        $tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer(self::getConnection(), $cache, $schemaAnalyzer, Configuration::getDefaultLockFilePath());*/
-
         $fks = $this->tdbmSchemaAnalyzer->getIncomingForeignKeys('country');
         $this->assertCount(5, $fks);
         $tables = [$fks[0]->getLocalTableName(), $fks[1]->getLocalTableName(), $fks[2]->getLocalTableName(), $fks[3]->getLocalTableName(), $fks[4]->getLocalTableName()];
@@ -77,10 +65,6 @@ public function testGetIncomingForeignKeys3(): void
 
     public function testGetPivotTableLinkedToTable(): void
     {
-        /*$schemaAnalyzer = new SchemaAnalyzer(self::getConnection()->getSchemaManager(), new ArrayCache(), 'prefix_');
-        $cache = new ArrayCache();
-        $tdbmSchemaAnalyzer = new TDBMSchemaAnalyzer(self::getConnection(), $cache, $schemaAnalyzer, Configuration::getDefaultLockFilePath());*/
-
         $pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable('rights');
         $this->assertCount(1, $pivotTables);
         $this->assertEquals('roles_rights', $pivotTables[0]);
@@ -91,18 +75,4 @@ public function testGetPivotTableLinkedToTable(): void
         $pivotTables = $this->tdbmSchemaAnalyzer->getPivotTableLinkedToTable('animal');
         $this->assertCount(0, $pivotTables);
     }
-
-    /*public function testGetCompulsoryColumnsWithNoInheritance() {
-        $table = $this->tdbmSchemaAnalyzer->getSchema()->getTable('country');
-        $compulsoryColumns = $this->tdbmSchemaAnalyzer->getCompulsoryProperties($table);
-        $this->assertCount(1, $compulsoryColumns);
-        $this->assertArrayHasKey("label", $compulsoryColumns);
-    }
-
-    public function testGetCompulsoryColumnsWithInheritance() {
-        $table = $this->tdbmSchemaAnalyzer->getSchema()->getTable('users');
-        $compulsoryColumns = $this->tdbmSchemaAnalyzer->getCompulsoryProperties($table);
-        $this->assertCount(5, $compulsoryColumns);
-        $this->assertEquals(['name', 'created_at', 'email', 'country_id', 'login'], array_keys($compulsoryColumns));
-    }*/
 }