Skip to content

Commit ebfc006

Browse files
authored
Add the ComparatorConfig parameter (doctrine#7067)
| Q | A |------------- | ----------- | Type | improvement | Fixed issues | Follows doctrine#6300 #### Summary This PR materializes the previously virtual `ComparatorConfig` parameter in `AbstractSchemaManager::createComparator()`.
1 parent 76300e2 commit ebfc006

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

src/Schema/AbstractSchemaManager.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929
use function array_values;
3030
use function assert;
3131
use function count;
32-
use function func_get_arg;
33-
use function func_num_args;
3432
use function strtolower;
3533

3634
/**
@@ -1204,9 +1202,9 @@ private function getDatabase(string $methodName): string
12041202
return $database;
12051203
}
12061204

1207-
public function createComparator(/* ComparatorConfig $config = new ComparatorConfig() */): Comparator
1205+
public function createComparator(ComparatorConfig $config = new ComparatorConfig()): Comparator
12081206
{
1209-
return new Comparator($this->platform, func_num_args() > 0 ? func_get_arg(0) : new ComparatorConfig());
1207+
return new Comparator($this->platform, $config);
12101208
}
12111209

12121210
/**

src/Schema/MySQLSchemaManager.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
use function array_map;
2222
use function assert;
2323
use function explode;
24-
use function func_get_arg;
25-
use function func_num_args;
2624
use function implode;
2725
use function preg_match;
2826
use function preg_match_all;
@@ -275,7 +273,7 @@ protected function _getPortableTableForeignKeysList(array $rows): array
275273
}
276274

277275
/** @throws Exception */
278-
public function createComparator(/* ComparatorConfig $config = new ComparatorConfig() */): Comparator
276+
public function createComparator(ComparatorConfig $config = new ComparatorConfig()): Comparator
279277
{
280278
return new MySQL\Comparator(
281279
$this->platform,
@@ -286,7 +284,7 @@ public function createComparator(/* ComparatorConfig $config = new ComparatorCon
286284
new ConnectionCollationMetadataProvider($this->connection),
287285
),
288286
$this->getDefaultTableOptions(),
289-
func_num_args() > 0 ? func_get_arg(0) : new ComparatorConfig(),
287+
$config,
290288
);
291289
}
292290

src/Schema/SQLServerSchemaManager.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
use Doctrine\DBAL\Schema\Name\OptionallyQualifiedName;
1313

1414
use function assert;
15-
use function func_get_arg;
16-
use function func_num_args;
1715
use function implode;
1816
use function is_string;
1917
use function preg_match;
@@ -220,12 +218,12 @@ protected function _getPortableViewDefinition(array $view): View
220218
}
221219

222220
/** @throws Exception */
223-
public function createComparator(/* ComparatorConfig $config = new ComparatorConfig() */): Comparator
221+
public function createComparator(ComparatorConfig $config = new ComparatorConfig()): Comparator
224222
{
225223
return new SQLServer\Comparator(
226224
$this->platform,
227225
$this->getDatabaseCollation(),
228-
func_num_args() > 0 ? func_get_arg(0) : new ComparatorConfig(),
226+
$config,
229227
);
230228
}
231229

src/Schema/SQLiteSchemaManager.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
use function array_merge;
2020
use function assert;
2121
use function count;
22-
use function func_get_arg;
23-
use function func_num_args;
2422
use function implode;
2523
use function is_string;
2624
use function preg_match;
@@ -334,9 +332,9 @@ private function parseOptionallyQuotedName(string $sql): string
334332
return $sql;
335333
}
336334

337-
public function createComparator(/* ComparatorConfig $config = new ComparatorConfig() */): Comparator
335+
public function createComparator(ComparatorConfig $config = new ComparatorConfig()): Comparator
338336
{
339-
return new SQLite\Comparator($this->platform, func_num_args() > 0 ? func_get_arg(0) : new ComparatorConfig());
337+
return new SQLite\Comparator($this->platform, $config);
340338
}
341339

342340
protected function selectTableNames(string $databaseName): Result

0 commit comments

Comments
 (0)