Merge pull request #212 from moufmouf/read_schema_from_lock_file

Always read the schema from the lock file

Author: moufmouf

phpstan.neon

@@ -15,11 +15,14 @@ parameters:
      - "#Method TheCodingMachine\\\\TDBM\\\\Schema\\\\ForeignKey::.*() should return .* but returns array<string>|string.#"
      - '#Method TheCodingMachine\\TDBM\\NativeWeakrefObjectStorage::get\(\) should return TheCodingMachine\\TDBM\\DbRow\|null but returns object\|null.#'
      -
-             message: '#WeakRef#'
-             path: src/WeakrefObjectStorage.php
+        message: '#WeakRef#'
+        path: src/WeakrefObjectStorage.php
      -
         message: '#Result of && is always false.#'
         path: src/Test/Dao/Bean/Generated/ArticleBaseBean.php
+     -
+        message: '#TheCodingMachine\\TDBM\\Schema\\LockFileSchemaManager::__construct\(\) does not call parent constructor from Doctrine\\DBAL\\Schema\\AbstractSchemaManager.#'
+        path: src/Schema/LockFileSchemaManager.php
     #reportUnmatchedIgnoredErrors: false
 includes:
     - vendor/thecodingmachine/phpstan-strict-rules/phpstan-strict-rules.neon

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,18 +119,20 @@ public function __construct(
         } else {
             $this->cache = new VoidCache();
         }
+        $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 {
-            $this->schemaAnalyzer = new SchemaAnalyzer($this->connection->getSchemaManager(), $this->cache, $this->getConnectionUniqueId());
+            $this->schemaAnalyzer = new SchemaAnalyzer($lockFileSchemaManager, $this->cache, $this->getConnectionUniqueId());
         }
         $this->logger = $logger;
         $this->generatorEventDispatcher = new GeneratorEventDispatcher($generatorListeners);
         $this->pathFinder = new PathFinder();
         $this->annotationParser = $annotationParser ?: AnnotationParser::buildWithDefaultAnnotations([]);
         $this->codeGeneratorListener = new CodeGeneratorEventDispatcher($codeGeneratorListeners);
-        $this->namingStrategy = $namingStrategy ?: new DefaultNamingStrategy($this->annotationParser, $this->connection->getSchemaManager());
-        $this->lockFilePath = $lockFilePath;
+        $this->namingStrategy = $namingStrategy ?: new DefaultNamingStrategy($this->annotationParser, $lockFileSchemaManager);
     }
 
     /**