Skip to content

Commit ade2eca

Browse files
TigrovTigrov
authored
Remove unnecessary calls (#221)
1 parent eb87324 commit ade2eca

7 files changed

Lines changed: 10 additions & 24 deletions

File tree

‎src/Command/DownCommand.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use Symfony\Component\Console\Question\ConfirmationQuestion;
1414
use Symfony\Component\Console\Style\SymfonyStyle;
1515
use Throwable;
16-
use Yiisoft\Db\Migration\Informer\ConsoleMigrationInformer;
1716
use Yiisoft\Db\Migration\Migrator;
1817
use Yiisoft\Db\Migration\Runner\DownRunner;
1918
use Yiisoft\Db\Migration\Service\MigrationService;
@@ -38,11 +37,8 @@ final class DownCommand extends Command
3837
public function __construct(
3938
private DownRunner $downRunner,
4039
private MigrationService $migrationService,
41-
private Migrator $migrator,
42-
ConsoleMigrationInformer $informer
40+
private Migrator $migrator
4341
) {
44-
$this->migrator->setInformer($informer);
45-
4642
parent::__construct();
4743
}
4844

‎src/Command/NewCommand.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Symfony\Component\Console\Input\InputOption;
1111
use Symfony\Component\Console\Output\OutputInterface;
1212
use Symfony\Component\Console\Style\SymfonyStyle;
13+
use Yiisoft\Db\Migration\Migrator;
1314
use Yiisoft\Db\Migration\Service\MigrationService;
1415

1516
use function count;
@@ -36,8 +37,10 @@
3637
#[AsCommand('migrate:new', 'Displays not yet applied migrations.')]
3738
final class NewCommand extends Command
3839
{
39-
public function __construct(private MigrationService $migrationService)
40-
{
40+
public function __construct(
41+
private MigrationService $migrationService,
42+
private Migrator $migrator
43+
) {
4144
parent::__construct();
4245
}
4346

@@ -53,6 +56,7 @@ protected function configure(): void
5356
protected function execute(InputInterface $input, OutputInterface $output): int
5457
{
5558
$io = new SymfonyStyle($input, $output);
59+
$this->migrator->setIO($io);
5660
$this->migrationService->setIO($io);
5761

5862
/** @psalm-var string[] $paths */

‎src/Command/RedoCommand.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use Symfony\Component\Console\Question\ConfirmationQuestion;
1414
use Symfony\Component\Console\Style\SymfonyStyle;
1515
use Throwable;
16-
use Yiisoft\Db\Migration\Informer\ConsoleMigrationInformer;
1716
use Yiisoft\Db\Migration\Migrator;
1817
use Yiisoft\Db\Migration\Runner\DownRunner;
1918
use Yiisoft\Db\Migration\Runner\UpdateRunner;
@@ -42,12 +41,9 @@ final class RedoCommand extends Command
4241
public function __construct(
4342
private MigrationService $migrationService,
4443
private Migrator $migrator,
45-
ConsoleMigrationInformer $informer,
4644
private DownRunner $downRunner,
4745
private UpdateRunner $updateRunner
4846
) {
49-
$this->migrator->setInformer($informer);
50-
5147
parent::__construct();
5248
}
5349

‎src/Command/UpdateCommand.php‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
use Symfony\Component\Console\Question\ConfirmationQuestion;
1414
use Symfony\Component\Console\Style\SymfonyStyle;
1515
use Throwable;
16-
use Yiisoft\Db\Migration\Informer\ConsoleMigrationInformer;
1716
use Yiisoft\Db\Migration\Migrator;
1817
use Yiisoft\Db\Migration\Runner\UpdateRunner;
1918
use Yiisoft\Db\Migration\Service\MigrationService;
@@ -44,8 +43,7 @@ final class UpdateCommand extends Command
4443
public function __construct(
4544
private UpdateRunner $updateRunner,
4645
private MigrationService $migrationService,
47-
private Migrator $migrator,
48-
ConsoleMigrationInformer $informer
46+
private Migrator $migrator
4947
) {
5048
parent::__construct();
5149
}
@@ -61,7 +59,7 @@ protected function configure(): void
6159
protected function execute(InputInterface $input, OutputInterface $output): int
6260
{
6361
$io = new SymfonyStyle($input, $output);
64-
62+
$this->migrator->setIO($io);
6563
$this->migrationService->setIO($io);
6664
$this->updateRunner->setIO($io);
6765

‎src/Migrator.php‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,6 @@ public function __construct(
2323
) {
2424
}
2525

26-
public function setInformer(MigrationInformerInterface $informer): void
27-
{
28-
$this->informer = $informer;
29-
}
30-
3126
public function setIO(?SymfonyStyle $io): void
3227
{
3328
$this->informer->setIO($io);

‎src/Service/MigrationService.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ public function __construct(
5555
public function setIO(?SymfonyStyle $io): void
5656
{
5757
$this->io = $io;
58-
$this->migrator->setIO($io);
5958
}
6059

6160
/**

‎tests/Support/Helper/ContainerHelper.php‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,20 +79,19 @@ public static function get(ContainerInterface $container, string $id, ContainerC
7979
$container->get(UpdateRunner::class),
8080
$container->get(MigrationService::class),
8181
$container->get(Migrator::class),
82-
$container->get(ConsoleMigrationInformer::class),
8382
);
8483

8584
case DownCommand::class:
8685
return new DownCommand(
8786
$container->get(DownRunner::class),
8887
$container->get(MigrationService::class),
8988
$container->get(Migrator::class),
90-
$container->get(ConsoleMigrationInformer::class),
9189
);
9290

9391
case NewCommand::class:
9492
return new NewCommand(
9593
$container->get(MigrationService::class),
94+
$container->get(Migrator::class),
9695
);
9796

9897
case HistoryCommand::class:
@@ -105,7 +104,6 @@ public static function get(ContainerInterface $container, string $id, ContainerC
105104
return new RedoCommand(
106105
$container->get(MigrationService::class),
107106
$container->get(Migrator::class),
108-
$container->get(ConsoleMigrationInformer::class),
109107
$container->get(DownRunner::class),
110108
$container->get(UpdateRunner::class),
111109
);

0 commit comments

Comments
 (0)