Skip to content

Commit 09a64a3

Browse files
greg0iregreg0ire
committed
Upgrade some dependencies
We cannot use Composer 2 otherwise.
1 parent 955077b commit 09a64a3

21 files changed

+2413
-1948
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ jobs:
4545
- stage: Code Quality
4646
env: STATIC_ANALYSIS
4747
install: travis_retry composer install --prefer-dist
48-
script: vendor/bin/phpstan analyse -l 7 -c phpstan.neon Command Tests
48+
script: vendor/bin/phpstan analyse

‎Command/DoctrineCommand.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
1313
use Symfony\Component\DependencyInjection\ContainerInterface;
1414
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
15+
1516
use function error_get_last;
1617
use function is_dir;
17-
use function method_exists;
1818
use function mkdir;
1919
use function preg_match;
2020
use function sprintf;
@@ -25,11 +25,11 @@
2525
*/
2626
abstract class DoctrineCommand extends BaseCommand
2727
{
28-
public static function configureMigrations(ContainerInterface $container, Configuration $configuration) : void
28+
public static function configureMigrations(ContainerInterface $container, Configuration $configuration): void
2929
{
3030
$dir = $configuration->getMigrationsDirectory();
3131

32-
if (empty($dir)) {
32+
if ($dir === null) {
3333
$dir = $container->getParameter('doctrine_migrations.dir_name');
3434

3535
if (! is_dir($dir) && ! @mkdir($dir, 0777, true) && ! is_dir($dir)) {
@@ -48,7 +48,7 @@ public static function configureMigrations(ContainerInterface $container, Config
4848
$pathPlaceholderArray = ['kernel.root_dir', 'kernel.cache_dir', 'kernel.logs_dir'];
4949

5050
foreach ($pathPlaceholderArray as $pathPlaceholder) {
51-
if (! $container->hasParameter($pathPlaceholder) || ! preg_match('/\%' . $pathPlaceholder . '\%/', $dir)) {
51+
if (! $container->hasParameter($pathPlaceholder) || preg_match('/\%' . $pathPlaceholder . '\%/', $dir) === 0) {
5252
continue;
5353
}
5454

@@ -68,16 +68,16 @@ public static function configureMigrations(ContainerInterface $container, Config
6868
$configuration->setMigrationsDirectory($dir);
6969
}
7070

71-
if (empty($configuration->getMigrationsNamespace())) {
71+
if ($configuration->getMigrationsNamespace() === null) {
7272
$configuration->setMigrationsNamespace($container->getParameter('doctrine_migrations.namespace'));
7373
}
7474

75-
if (empty($configuration->getName())) {
75+
if ($configuration->getName() === null) {
7676
$configuration->setName($container->getParameter('doctrine_migrations.name'));
7777
}
7878

7979
// For backward compatibility, need use a table from parameters for overwrite the default configuration
80-
if (! ($configuration instanceof AbstractFileConfiguration) || empty($configuration->getMigrationsTableName())) {
80+
if (! ($configuration instanceof AbstractFileConfiguration) || $configuration->getMigrationsTableName() === '') {
8181
$configuration->setMigrationsTableName($container->getParameter('doctrine_migrations.table_name'));
8282
}
8383

@@ -95,7 +95,7 @@ public static function configureMigrations(ContainerInterface $container, Config
9595
}
9696
}
9797

98-
if (method_exists($configuration, 'getCustomTemplate') && empty($configuration->getCustomTemplate())) {
98+
if ($configuration->getCustomTemplate() === null) {
9999
$configuration->setCustomTemplate($container->getParameter('doctrine_migrations.custom_template'));
100100
}
101101

@@ -125,7 +125,7 @@ public static function configureMigrations(ContainerInterface $container, Config
125125
*
126126
* Injects the container to migrations aware of it
127127
*/
128-
private static function injectContainerToMigrations(ContainerInterface $container, array $versions) : void
128+
private static function injectContainerToMigrations(ContainerInterface $container, array $versions): void
129129
{
130130
foreach ($versions as $version) {
131131
$migration = $version->getMigration();

‎Command/Helper/DoctrineCommandHelper.php

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
use LogicException;
1212
use Symfony\Bundle\FrameworkBundle\Console\Application;
1313
use Symfony\Component\Console\Input\InputInterface;
14-
use Symfony\Component\DependencyInjection\ContainerInterface;
14+
1515
use function assert;
1616
use function count;
17+
use function is_string;
1718
use function sprintf;
1819

1920
/**
@@ -22,13 +23,11 @@
2223
*/
2324
abstract class DoctrineCommandHelper extends BaseDoctrineCommandHelper
2425
{
25-
public static function setApplicationHelper(Application $application, InputInterface $input) : void
26+
public static function setApplicationHelper(Application $application, InputInterface $input): void
2627
{
2728
$container = $application->getKernel()->getContainer();
28-
assert($container instanceof ContainerInterface);
29-
30-
/** @var Registry $doctrine */
31-
$doctrine = $container->get('doctrine');
29+
$doctrine = $container->get('doctrine');
30+
assert($doctrine instanceof Registry);
3231

3332
$managerNames = $doctrine->getManagerNames();
3433

@@ -42,25 +41,34 @@ public static function setApplicationHelper(Application $application, InputInter
4241
return;
4342
}
4443

45-
/** @var ConnectionHelper $dbHelper */
4644
$dbHelper = $application->getHelperSet()->get('db');
45+
assert($dbHelper instanceof ConnectionHelper);
4746

4847
$connection = $dbHelper->getConnection();
4948

5049
if (! $connection instanceof PoolingShardConnection) {
5150
if (count($managerNames) === 0) {
51+
$db = $input->getOption('db');
52+
assert(is_string($db));
53+
5254
throw new LogicException(sprintf(
5355
"Connection '%s' must implement shards configuration.",
54-
$input->getOption('db')
56+
$db
5557
));
5658
}
5759

60+
$em = $input->getOption('em');
61+
assert(is_string($em));
62+
5863
throw new LogicException(sprintf(
5964
"Connection of EntityManager '%s' must implement shards configuration.",
60-
$input->getOption('em')
65+
$em
6166
));
6267
}
6368

64-
$connection->connect($input->getOption('shard'));
69+
$shard = $input->getOption('shard');
70+
assert(is_string($shard));
71+
72+
$connection->connect($shard);
6573
}
6674
}

‎Command/MigrationsDiffDoctrineCommand.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Symfony\Component\Console\Input\InputInterface;
1111
use Symfony\Component\Console\Input\InputOption;
1212
use Symfony\Component\Console\Output\OutputInterface;
13-
use Symfony\Component\DependencyInjection\ContainerInterface;
13+
1414
use function assert;
1515

1616
/**
@@ -22,7 +22,7 @@ class MigrationsDiffDoctrineCommand extends DiffCommand
2222
/** @var string */
2323
protected static $defaultName = 'doctrine:migrations:diff';
2424

25-
protected function configure() : void
25+
protected function configure(): void
2626
{
2727
parent::configure();
2828

@@ -32,22 +32,21 @@ protected function configure() : void
3232
->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
3333
}
3434

35-
public function initialize(InputInterface $input, OutputInterface $output) : void
35+
public function initialize(InputInterface $input, OutputInterface $output): void
3636
{
37-
/** @var Application $application */
3837
$application = $this->getApplication();
38+
assert($application instanceof Application);
3939

4040
Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
4141

4242
$configuration = $this->getMigrationConfiguration($input, $output);
4343
$container = $application->getKernel()->getContainer();
44-
assert($container instanceof ContainerInterface);
4544
DoctrineCommand::configureMigrations($container, $configuration);
4645

4746
parent::initialize($input, $output);
4847
}
4948

50-
public function execute(InputInterface $input, OutputInterface $output) : ?int
49+
public function execute(InputInterface $input, OutputInterface $output): ?int
5150
{
5251
// EM and DB options cannot be set at same time
5352
if ($input->getOption('em') !== null && $input->getOption('db') !== null) {

‎Command/MigrationsDumpSchemaDoctrineCommand.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Symfony\Component\Console\Input\InputInterface;
1111
use Symfony\Component\Console\Input\InputOption;
1212
use Symfony\Component\Console\Output\OutputInterface;
13-
use Symfony\Component\DependencyInjection\ContainerInterface;
13+
1414
use function assert;
1515

1616
/**
@@ -21,7 +21,7 @@ class MigrationsDumpSchemaDoctrineCommand extends DumpSchemaCommand
2121
/** @var string */
2222
protected static $defaultName = 'doctrine:migrations:dump-schema';
2323

24-
protected function configure() : void
24+
protected function configure(): void
2525
{
2626
parent::configure();
2727

@@ -31,22 +31,21 @@ protected function configure() : void
3131
->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
3232
}
3333

34-
public function initialize(InputInterface $input, OutputInterface $output) : void
34+
public function initialize(InputInterface $input, OutputInterface $output): void
3535
{
36-
/** @var Application $application */
3736
$application = $this->getApplication();
37+
assert($application instanceof Application);
3838

3939
Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
4040

4141
$configuration = $this->getMigrationConfiguration($input, $output);
4242
$container = $application->getKernel()->getContainer();
43-
assert($container instanceof ContainerInterface);
4443
DoctrineCommand::configureMigrations($container, $configuration);
4544

4645
parent::initialize($input, $output);
4746
}
4847

49-
public function execute(InputInterface $input, OutputInterface $output) : ?int
48+
public function execute(InputInterface $input, OutputInterface $output): ?int
5049
{
5150
// EM and DB options cannot be set at same time
5251
if ($input->getOption('em') !== null && $input->getOption('db') !== null) {

‎Command/MigrationsExecuteDoctrineCommand.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Symfony\Component\Console\Input\InputInterface;
1111
use Symfony\Component\Console\Input\InputOption;
1212
use Symfony\Component\Console\Output\OutputInterface;
13-
use Symfony\Component\DependencyInjection\ContainerInterface;
13+
1414
use function assert;
1515

1616
/**
@@ -21,7 +21,7 @@ class MigrationsExecuteDoctrineCommand extends ExecuteCommand
2121
/** @var string */
2222
protected static $defaultName = 'doctrine:migrations:execute';
2323

24-
protected function configure() : void
24+
protected function configure(): void
2525
{
2626
parent::configure();
2727

@@ -31,22 +31,21 @@ protected function configure() : void
3131
->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
3232
}
3333

34-
public function initialize(InputInterface $input, OutputInterface $output) : void
34+
public function initialize(InputInterface $input, OutputInterface $output): void
3535
{
36-
/** @var Application $application */
3736
$application = $this->getApplication();
37+
assert($application instanceof Application);
3838

3939
Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
4040

4141
$configuration = $this->getMigrationConfiguration($input, $output);
4242
$container = $application->getKernel()->getContainer();
43-
assert($container instanceof ContainerInterface);
4443
DoctrineCommand::configureMigrations($container, $configuration);
4544

4645
parent::initialize($input, $output);
4746
}
4847

49-
public function execute(InputInterface $input, OutputInterface $output) : ?int
48+
public function execute(InputInterface $input, OutputInterface $output): ?int
5049
{
5150
// EM and DB options cannot be set at same time
5251
if ($input->getOption('em') !== null && $input->getOption('db') !== null) {

‎Command/MigrationsGenerateDoctrineCommand.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Symfony\Component\Console\Input\InputInterface;
1111
use Symfony\Component\Console\Input\InputOption;
1212
use Symfony\Component\Console\Output\OutputInterface;
13-
use Symfony\Component\DependencyInjection\ContainerInterface;
13+
1414
use function assert;
1515

1616
/**
@@ -21,7 +21,7 @@ class MigrationsGenerateDoctrineCommand extends GenerateCommand
2121
/** @var string */
2222
protected static $defaultName = 'doctrine:migrations:generate';
2323

24-
protected function configure() : void
24+
protected function configure(): void
2525
{
2626
parent::configure();
2727

@@ -31,22 +31,21 @@ protected function configure() : void
3131
->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
3232
}
3333

34-
public function initialize(InputInterface $input, OutputInterface $output) : void
34+
public function initialize(InputInterface $input, OutputInterface $output): void
3535
{
36-
/** @var Application $application */
3736
$application = $this->getApplication();
37+
assert($application instanceof Application);
3838

3939
Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
4040

4141
$configuration = $this->getMigrationConfiguration($input, $output);
4242
$container = $application->getKernel()->getContainer();
43-
assert($container instanceof ContainerInterface);
4443
DoctrineCommand::configureMigrations($container, $configuration);
4544

4645
parent::initialize($input, $output);
4746
}
4847

49-
public function execute(InputInterface $input, OutputInterface $output) : ?int
48+
public function execute(InputInterface $input, OutputInterface $output): ?int
5049
{
5150
// EM and DB options cannot be set at same time
5251
if ($input->getOption('em') !== null && $input->getOption('db') !== null) {

‎Command/MigrationsLatestDoctrineCommand.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Symfony\Component\Console\Input\InputInterface;
1111
use Symfony\Component\Console\Input\InputOption;
1212
use Symfony\Component\Console\Output\OutputInterface;
13-
use Symfony\Component\DependencyInjection\ContainerInterface;
13+
1414
use function assert;
1515

1616
/**
@@ -21,7 +21,7 @@ class MigrationsLatestDoctrineCommand extends LatestCommand
2121
/** @var string */
2222
protected static $defaultName = 'doctrine:migrations:latest';
2323

24-
protected function configure() : void
24+
protected function configure(): void
2525
{
2626
parent::configure();
2727

@@ -31,22 +31,21 @@ protected function configure() : void
3131
->addOption('shard', null, InputOption::VALUE_REQUIRED, 'The shard connection to use for this command.');
3232
}
3333

34-
public function initialize(InputInterface $input, OutputInterface $output) : void
34+
public function initialize(InputInterface $input, OutputInterface $output): void
3535
{
36-
/** @var Application $application */
3736
$application = $this->getApplication();
37+
assert($application instanceof Application);
3838

3939
Helper\DoctrineCommandHelper::setApplicationHelper($application, $input);
4040

4141
$configuration = $this->getMigrationConfiguration($input, $output);
4242
$container = $application->getKernel()->getContainer();
43-
assert($container instanceof ContainerInterface);
4443
DoctrineCommand::configureMigrations($container, $configuration);
4544

4645
parent::initialize($input, $output);
4746
}
4847

49-
public function execute(InputInterface $input, OutputInterface $output) : ?int
48+
public function execute(InputInterface $input, OutputInterface $output): ?int
5049
{
5150
// EM and DB options cannot be set at same time
5251
if ($input->getOption('em') !== null && $input->getOption('db') !== null) {

0 commit comments

Comments
 (0)