👽 Cleanup deprecated calls, sort tables in dump (to match 5.x behaviour)

- `setCustomSchemaOptions` => `setPlatformOptions`
- `hasPrimaryKey` => `getPrimaryKey()` (nullable)
- `getColumns` => `getLocalColumns`

Author: homersimpsons

src/SchemaVersionControl/SchemaBuilder.php

@@ -92,7 +92,7 @@ protected function buildColumn(array $columnDesc, Column $column)
             $column->setComment($columnDesc['comment']);
         }
         if (isset($columnDesc['custom'])) {
-            $column->setCustomSchemaOptions($columnDesc['custom']);
+            $column->setPlatformOptions($columnDesc['custom']);
         }
     }
 

src/SchemaVersionControl/SchemaNormalizer.php

@@ -32,15 +32,18 @@ public function normalize(Schema $schema): array
         foreach ($schema->getTables() as $table) {
             $schemaDesc['tables'][$table->getName()] = $this->normalizeTable($table);
         }
+        ksort($schemaDesc['tables']);
+
         return $schemaDesc;
     }
 
     protected function normalizeTable(Table $table)
     {
         $tableDesc = [];
 
-        if ($table->hasPrimaryKey()) {
-            $pk_columns = $table->getPrimaryKey()->getUnquotedColumns();
+        $primaryKey = $table->getPrimaryKey();
+        if ($primaryKey) {
+            $pk_columns = $primaryKey->getUnquotedColumns();
         } else {
             $pk_columns = [];
         }
@@ -103,8 +106,8 @@ protected function normalizeColumn(Column $column, bool $isPrimaryKey)
         if ($column->getComment() !== null) {
             $columnDesc['comment'] = $column->getComment();
         }
-        if (!empty($column->getCustomSchemaOptions())) {
-            $columnDesc['custom'] = $column->getCustomSchemaOptions();
+        if (!empty($column->getPlatformOptions())) {
+            $columnDesc['custom'] = $column->getPlatformOptions();
         }
 
         if (count($columnDesc) > 1) {
@@ -117,10 +120,10 @@ protected function normalizeColumn(Column $column, bool $isPrimaryKey)
     protected function normalizeForeignKeyConstraint(ForeignKeyConstraint $foreignKeyConstraint)
     {
         $constraintDesc = [];
-        if (count($foreignKeyConstraint->getColumns()) > 1) {
-            $constraintDesc['columns'] = $foreignKeyConstraint->getColumns();
+        if (count($foreignKeyConstraint->getLocalColumns()) > 1) {
+            $constraintDesc['columns'] = $foreignKeyConstraint->getLocalColumns();
         } else {
-            $constraintDesc['column'] = $foreignKeyConstraint->getColumns()[0];
+            $constraintDesc['column'] = $foreignKeyConstraint->getLocalColumns()[0];
         }
 
         $constraintDesc['references'] = $this->normalizeForeignReference($foreignKeyConstraint);
@@ -135,8 +138,8 @@ protected function normalizeForeignReference(ForeignKeyConstraint $foreignKeyCon
         $referenceDesc = [];
         $foreignTableName = $foreignKeyConstraint->getForeignTableName();
         $foreignTable = $this->schema->getTable($foreignTableName);
-        if ($foreignTable->hasPrimaryKey()
-            && $foreignTable->getPrimaryKeyColumns() == $foreignKeyConstraint->getForeignColumns()) {
+        $foreignPrimaryKey = $foreignTable->getPrimaryKey();
+        if ($foreignPrimaryKey && $foreignPrimaryKey->getColumns() == $foreignKeyConstraint->getForeignColumns()) {
             $referenceDesc = $foreignKeyConstraint->getForeignTableName();
         } else {
             $referenceDesc['table'] = $foreignKeyConstraint->getForeignTableName();

src/SchemaVersionControl/SchemaVersionControlService.php

@@ -30,15 +30,6 @@ public function __construct(Connection $connection, string $schemaFile)
         $this->schemaFile = $schemaFile;
     }
 
-    /**
-     * Get the current schema used in database.
-     * @return Schema
-     */
-    public function getCurrentSchema(): Schema
-    {
-        return $this->connection->createSchemaManager()->createSchema();
-    }
-
     /**
      * Load schema from config file.
      * @return Schema
@@ -64,7 +55,8 @@ public function loadSchemaFile(): Schema
      */
     public function dumpSchema(): void
     {
-        $schema = $this->getCurrentSchema();
+        $schemaManager = $this->connection->createSchemaManager();
+        $schema = $schemaManager->createSchema();
         $normalizer = new SchemaNormalizer();
         $desc = $normalizer->normalize($schema);
         $yamlSchema = Yaml::dump(['schema' => $desc], 10, 2);