Skip to content

Commit ad79269

Browse files
LOBsTerrLOBsTerr
authored
Refactoring (#3967)
* Add new arguments key and target. Make it possible use not only default target for db connections * Update composer file to use latest phpunit * Move method moduleRequrement to the install command, because it is not used anywhere else * Remove unused line * Remove ContainerAware extension, because it is not used * Remove useless ContainerAwareClass extension or add it where it is missing * Revert composer.json changes * Revert composer.json changes
1 parent a0f3f93 commit ad79269

24 files changed

+215
-285
lines changed

‎src/Command/Debug/ContainerCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
namespace Drupal\Console\Command\Debug;
99

10-
use Symfony\Component\Console\Input\InputInterface;
11-
use Symfony\Component\Console\Output\OutputInterface;
10+
use Drupal\Console\Core\Command\ContainerAwareCommand;
1211
use Symfony\Component\Console\Input\InputArgument;
12+
use Symfony\Component\Console\Input\InputInterface;
1313
use Symfony\Component\Console\Input\InputOption;
14-
use Drupal\Console\Core\Command\ContainerAwareCommand;
14+
use Symfony\Component\Console\Output\OutputInterface;
1515
use Symfony\Component\Yaml\Yaml;
1616

1717
/**

‎src/Command/Debug/PermissionCommand.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22

33
/**
44
* @file
5-
* Contains \Drupal\Console\Command\PermissionDebugCommand.
5+
* Contains \Drupal\Console\Command\PermissionCommand.
66
*/
77

88
namespace Drupal\Console\Command\Debug;
99

10+
use Drupal\Console\Core\Command\Command;
1011
use Symfony\Component\Console\Input\InputInterface;
1112
use Symfony\Component\Console\Output\OutputInterface;
1213
use Symfony\Component\Console\Input\InputArgument;
13-
use Drupal\Console\Core\Command\ContainerAwareCommand;
1414

1515
/**
1616
* Class DebugCommand
1717
*
1818
* @package Drupal\Console\Command\Debug
1919
*/
20-
class PermissionCommand extends ContainerAwareCommand
20+
class PermissionCommand extends Command
2121
{
2222
/**
2323
* {@inheritdoc}

‎src/Command/Debug/ViewsPluginsCommand.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77

88
namespace Drupal\Console\Command\Debug;
99

10+
use Drupal\Console\Core\Command\Command;
11+
use Drupal\views\Views;
1012
use Symfony\Component\Console\Input\InputArgument;
1113
use Symfony\Component\Console\Input\InputInterface;
1214
use Symfony\Component\Console\Output\OutputInterface;
13-
use Drupal\Console\Core\Command\ContainerAwareCommand;
14-
use Drupal\views\Views;
1515

1616
/**
1717
* Class ViewsPluginsCommand
1818
*
1919
* @package Drupal\Console\Command\Debug
2020
*/
21-
class ViewsPluginsCommand extends ContainerAwareCommand
21+
class ViewsPluginsCommand extends Command
2222
{
2323
/**
2424
* {@inheritdoc}
@@ -63,7 +63,7 @@ protected function pluginList($type)
6363
foreach ($plugin['views'] as $plugin_name => $view) {
6464
$views[] = $view;
6565
}
66-
$rows[] = [$plugin['type'], $plugin['title'], $plugin['provider'], implode(",", $views)];
66+
$rows[] = [$plugin['type'], $plugin['title'], $plugin['provider'], implode(',', $views)];
6767
}
6868

6969
// Sort rows by field name.

‎src/Command/Generate/CacheContextCommand.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,20 @@
77

88
namespace Drupal\Console\Command\Generate;
99

10+
use Drupal\Console\Command\Shared\ConfirmationTrait;
11+
use Drupal\Console\Command\Shared\ModuleTrait;
12+
use Drupal\Console\Command\Shared\ServicesTrait;
13+
use Drupal\Console\Core\Command\Command;
14+
use Drupal\Console\Core\Utils\ChainQueue;
15+
use Drupal\Console\Core\Utils\StringConverter;
16+
use Drupal\Console\Generator\CacheContextGenerator;
17+
use Drupal\Console\Extension\Manager;
1018
use Drupal\Console\Utils\Validator;
1119
use Symfony\Component\Console\Input\InputInterface;
1220
use Symfony\Component\Console\Input\InputOption;
1321
use Symfony\Component\Console\Output\OutputInterface;
14-
use Drupal\Console\Command\Shared\ModuleTrait;
15-
use Drupal\Console\Generator\CacheContextGenerator;
16-
use Drupal\Console\Command\Shared\ConfirmationTrait;
17-
use Drupal\Console\Core\Command\ContainerAwareCommand;
18-
use Drupal\Console\Core\Utils\ChainQueue;
19-
use Drupal\Console\Extension\Manager;
20-
use Drupal\Console\Command\Shared\ServicesTrait;
21-
use Drupal\Console\Core\Utils\StringConverter;
2222

23-
class CacheContextCommand extends ContainerAwareCommand
23+
class CacheContextCommand extends Command
2424
{
2525
use ModuleTrait;
2626
use ConfirmationTrait;

‎src/Command/Generate/CommandCommand.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88
namespace Drupal\Console\Command\Generate;
99

10-
use Drupal\Console\Command\Shared\ExtensionTrait;
11-
use Drupal\Console\Command\Shared\ServicesTrait;
12-
use Symfony\Component\Console\Input\InputInterface;
13-
use Symfony\Component\Console\Output\OutputInterface;
14-
use Symfony\Component\Console\Input\InputOption;
15-
use Drupal\Console\Core\Command\ContainerAwareCommand;
1610
use Drupal\Console\Command\Shared\ConfirmationTrait;
1711
use Drupal\Console\Command\Shared\ModuleTrait;
18-
use Drupal\Console\Generator\CommandGenerator;
12+
use Drupal\Console\Command\Shared\ExtensionTrait;
13+
use Drupal\Console\Command\Shared\ServicesTrait;
14+
use Drupal\Console\Core\Command\Command;
1915
use Drupal\Console\Core\Utils\StringConverter;
16+
use Drupal\Console\Generator\CommandGenerator;
2017
use Drupal\Console\Extension\Manager;
2118
use Drupal\Console\Utils\Validator;
2219
use Drupal\Console\Utils\Site;
20+
use Symfony\Component\Console\Input\InputInterface;
21+
use Symfony\Component\Console\Input\InputOption;
22+
use Symfony\Component\Console\Output\OutputInterface;
2323

24-
class CommandCommand extends ContainerAwareCommand
24+
class CommandCommand extends Command
2525
{
2626
use ConfirmationTrait;
2727
use ServicesTrait;

‎src/Command/Generate/ControllerCommand.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77

88
namespace Drupal\Console\Command\Generate;
99

10-
use Symfony\Component\Console\Input\InputInterface;
11-
use Symfony\Component\Console\Input\InputOption;
12-
use Symfony\Component\Console\Output\OutputInterface;
13-
use Drupal\Console\Command\Shared\ServicesTrait;
1410
use Drupal\Console\Command\Shared\ConfirmationTrait;
1511
use Drupal\Console\Command\Shared\ModuleTrait;
12+
use Drupal\Console\Command\Shared\ServicesTrait;
1613
use Drupal\Console\Generator\ControllerGenerator;
17-
use Drupal\Console\Core\Command\ContainerAwareCommand;
18-
use Drupal\Core\Routing\RouteProviderInterface;
19-
use Drupal\Console\Core\Utils\StringConverter;
20-
use Drupal\Console\Core\Utils\ChainQueue;
14+
use Drupal\Console\Core\Command\Command;
2115
use Drupal\Console\Core\Command\Shared\InputTrait;
16+
use Drupal\Console\Core\Utils\ChainQueue;
17+
use Drupal\Console\Core\Utils\StringConverter;
2218
use Drupal\Console\Extension\Manager;
2319
use Drupal\Console\Utils\Validator;
20+
use Drupal\Core\Routing\RouteProviderInterface;
21+
use Symfony\Component\Console\Input\InputInterface;
22+
use Symfony\Component\Console\Input\InputOption;
23+
use Symfony\Component\Console\Output\OutputInterface;
2424

25-
class ControllerCommand extends ContainerAwareCommand
25+
class ControllerCommand extends Command
2626
{
2727
use ModuleTrait;
2828
use ServicesTrait;

‎src/Command/Generate/EventSubscriberCommand.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77

88
namespace Drupal\Console\Command\Generate;
99

10-
use Drupal\Console\Utils\Validator;
11-
use Symfony\Component\Console\Input\InputInterface;
12-
use Symfony\Component\Console\Input\InputOption;
13-
use Symfony\Component\Console\Output\OutputInterface;
14-
use Drupal\Console\Command\Shared\ServicesTrait;
15-
use Drupal\Console\Command\Shared\ModuleTrait;
16-
use Drupal\Console\Generator\EventSubscriberGenerator;
1710
use Drupal\Console\Command\Shared\ConfirmationTrait;
1811
use Drupal\Console\Command\Shared\EventsTrait;
19-
use Drupal\Console\Core\Command\ContainerAwareCommand;
12+
use Drupal\Console\Command\Shared\ModuleTrait;
13+
use Drupal\Console\Command\Shared\ServicesTrait;
14+
use Drupal\Console\Core\Command\Command;
15+
use Drupal\Console\Core\Utils\ChainQueue;
2016
use Drupal\Console\Core\Utils\StringConverter;
2117
use Drupal\Console\Extension\Manager;
18+
use Drupal\Console\Generator\EventSubscriberGenerator;
19+
use Drupal\Console\Utils\Validator;
20+
use Symfony\Component\Console\Input\InputInterface;
21+
use Symfony\Component\Console\Input\InputOption;
22+
use Symfony\Component\Console\Output\OutputInterface;
2223
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
23-
use Drupal\Console\Core\Utils\ChainQueue;
2424

25-
class EventSubscriberCommand extends ContainerAwareCommand
25+
class EventSubscriberCommand extends Command
2626
{
2727
use EventsTrait;
2828
use ServicesTrait;

‎src/Command/Generate/FormCommand.php

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
namespace Drupal\Console\Command\Generate;
99

1010
use Drupal\Console\Command\Shared\ArrayInputTrait;
11-
use Drupal\Console\Utils\TranslatorManager;
12-
use Drupal\Console\Utils\Validator;
13-
use Symfony\Component\Console\Input\InputInterface;
14-
use Symfony\Component\Console\Input\InputOption;
15-
use Symfony\Component\Console\Output\OutputInterface;
16-
use Drupal\Console\Command\Shared\ServicesTrait;
11+
use Drupal\Console\Command\Shared\FormTrait;
1712
use Drupal\Console\Command\Shared\ModuleTrait;
1813
use Drupal\Console\Command\Shared\MenuTrait;
19-
use Drupal\Console\Command\Shared\FormTrait;
20-
use Drupal\Console\Core\Command\ContainerAwareCommand;
21-
use Drupal\Console\Generator\FormGenerator;
22-
use Drupal\Console\Extension\Manager;
14+
use Drupal\Console\Command\Shared\ServicesTrait;
15+
use Drupal\Console\Core\Command\Command;
2316
use Drupal\Console\Core\Utils\ChainQueue;
2417
use Drupal\Console\Core\Utils\StringConverter;
18+
use Drupal\Console\Generator\FormGenerator;
19+
use Drupal\Console\Extension\Manager;
20+
use Drupal\Console\Utils\TranslatorManager;
21+
use Drupal\Console\Utils\Validator;
2522
use Drupal\Core\Render\ElementInfoManager;
2623
use Drupal\Core\Routing\RouteProviderInterface;
24+
use Symfony\Component\Console\Input\InputInterface;
25+
use Symfony\Component\Console\Input\InputOption;
26+
use Symfony\Component\Console\Output\OutputInterface;
2727

28-
abstract class FormCommand extends ContainerAwareCommand
28+
abstract class FormCommand extends Command
2929
{
3030
use ArrayInputTrait;
3131
use FormTrait;
@@ -306,7 +306,6 @@ function ($className) {
306306
$path = $input->getOption('path');
307307
if (!$path) {
308308
if ($this->formType == 'ConfigFormBase') {
309-
$form_path = '/admin/config/{{ module_name }}/{{ class_name_short }}';
310309
$form_path = sprintf(
311310
'/admin/config/%s/%s',
312311
$module,

‎src/Command/Generate/JsTestCommand.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Drupal\Console\Command\Shared\ConfirmationTrait;
1111
use Drupal\Console\Command\Shared\ModuleTrait;
1212
use Drupal\Console\Core\Command\Command;
13-
use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait;
1413
use Drupal\Console\Extension\Manager;
1514
use Drupal\Console\Generator\JsTestGenerator;
1615
use Drupal\Console\Utils\Validator;
@@ -22,7 +21,6 @@ class JsTestCommand extends Command
2221
{
2322
use ModuleTrait;
2423
use ConfirmationTrait;
25-
use ContainerAwareCommandTrait;
2624

2725
/**
2826
* @var Manager

‎src/Command/Generate/PluginBlockCommand.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,24 +8,24 @@
88
namespace Drupal\Console\Command\Generate;
99

1010
use Drupal\Console\Command\Shared\ArrayInputTrait;
11-
use Symfony\Component\Console\Input\InputInterface;
12-
use Symfony\Component\Console\Input\InputOption;
13-
use Symfony\Component\Console\Output\OutputInterface;
14-
use Drupal\Console\Core\Command\ContainerAwareCommand;
15-
use Drupal\Console\Generator\PluginBlockGenerator;
16-
use Drupal\Console\Command\Shared\ServicesTrait;
17-
use Drupal\Console\Command\Shared\ModuleTrait;
1811
use Drupal\Console\Command\Shared\FormTrait;
1912
use Drupal\Console\Command\Shared\ConfirmationTrait;
20-
use Drupal\Console\Extension\Manager;
21-
use Drupal\Console\Utils\Validator;
13+
use Drupal\Console\Command\Shared\ModuleTrait;
14+
use Drupal\Console\Command\Shared\ServicesTrait;
15+
use Drupal\Console\Core\Command\Command;
2216
use Drupal\Console\Core\Utils\StringConverter;
2317
use Drupal\Console\Core\Utils\ChainQueue;
18+
use Drupal\Console\Generator\PluginBlockGenerator;
19+
use Drupal\Console\Extension\Manager;
20+
use Drupal\Console\Utils\Validator;
2421
use Drupal\Core\Config\ConfigFactory;
2522
use Drupal\Core\Entity\EntityTypeManagerInterface;
2623
use Drupal\Core\Render\ElementInfoManagerInterface;
24+
use Symfony\Component\Console\Input\InputInterface;
25+
use Symfony\Component\Console\Input\InputOption;
26+
use Symfony\Component\Console\Output\OutputInterface;
2727

28-
class PluginBlockCommand extends ContainerAwareCommand
28+
class PluginBlockCommand extends Command
2929
{
3030
use ArrayInputTrait;
3131
use ServicesTrait;

0 commit comments

Comments
 (0)