diff --git a/src/Command/Cache/RebuildCommand.php b/src/Command/Cache/RebuildCommand.php index 01fedcd59..fb7fedfb1 100644 --- a/src/Command/Cache/RebuildCommand.php +++ b/src/Command/Cache/RebuildCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\HttpFoundation\RequestStack; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Utils\DrupalApi; use Drupal\Console\Utils\Site; use Drupal\Console\Core\Style\DrupalStyle; @@ -24,8 +23,6 @@ */ class RebuildCommand extends Command { - use CommandTrait; - /** * @var DrupalApi */ diff --git a/src/Command/Cache/TagInvalidateCommand.php b/src/Command/Cache/TagInvalidateCommand.php index 27b522bef..f7a978d4c 100644 --- a/src/Command/Cache/TagInvalidateCommand.php +++ b/src/Command/Cache/TagInvalidateCommand.php @@ -7,18 +7,15 @@ namespace Drupal\Console\Command\Cache; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Core\Cache\CacheTagsInvalidatorInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; class TagInvalidateCommand extends Command { - use CommandTrait; - /** * @var CacheTagsInvalidatorInterface */ diff --git a/src/Command/Config/DeleteCommand.php b/src/Command/Config/DeleteCommand.php index 99ce41e8b..75a05096d 100644 --- a/src/Command/Config/DeleteCommand.php +++ b/src/Command/Config/DeleteCommand.php @@ -10,17 +10,14 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Yaml\Exception\RuntimeException; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Config\StorageInterface; use Drupal\Core\Config\CachedStorage; use Drupal\Core\Config\ConfigFactory; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class DeleteCommand extends Command { - use CommandTrait; - protected $allConfig = []; /** diff --git a/src/Command/Config/DiffCommand.php b/src/Command/Config/DiffCommand.php index c97513940..708dd5f39 100644 --- a/src/Command/Config/DiffCommand.php +++ b/src/Command/Config/DiffCommand.php @@ -12,16 +12,13 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Config\CachedStorage; use Drupal\Core\Config\ConfigManager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class DiffCommand extends Command { - use CommandTrait; - /** * @var CachedStorage */ diff --git a/src/Command/Config/EditCommand.php b/src/Command/Config/EditCommand.php index fe1ddc46d..a3ef54d9f 100644 --- a/src/Command/Config/EditCommand.php +++ b/src/Command/Config/EditCommand.php @@ -17,15 +17,12 @@ use Drupal\Component\Serialization\Yaml; use Drupal\Core\Config\CachedStorage; use Drupal\Core\Config\ConfigFactory; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Core\Utils\ConfigurationManager; class EditCommand extends Command { - use CommandTrait; - /** * @var ConfigFactory */ diff --git a/src/Command/Config/ExportCommand.php b/src/Command/Config/ExportCommand.php index d0e24e73a..979aa2606 100644 --- a/src/Command/Config/ExportCommand.php +++ b/src/Command/Config/ExportCommand.php @@ -14,16 +14,13 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Filesystem\Filesystem; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Core\Config\ConfigManager; class ExportCommand extends Command { - use CommandTrait; - /** * @var ConfigManager */ diff --git a/src/Command/Config/ExportContentTypeCommand.php b/src/Command/Config/ExportContentTypeCommand.php index 684814b8f..f53c3e74c 100644 --- a/src/Command/Config/ExportContentTypeCommand.php +++ b/src/Command/Config/ExportContentTypeCommand.php @@ -12,17 +12,15 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Config\CachedStorage; use Drupal\Core\Entity\EntityTypeManagerInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Command\Shared\ExportTrait; use Drupal\Console\Extension\Manager; class ExportContentTypeCommand extends Command { - use CommandTrait; use ModuleTrait; use ExportTrait; diff --git a/src/Command/Config/ExportSingleCommand.php b/src/Command/Config/ExportSingleCommand.php index 28014a19c..b3086265a 100644 --- a/src/Command/Config/ExportSingleCommand.php +++ b/src/Command/Config/ExportSingleCommand.php @@ -12,18 +12,16 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Config\CachedStorage; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Command\Shared\ExportTrait; use Drupal\Console\Extension\Manager; use Webmozart\PathUtil\Path; class ExportSingleCommand extends Command { - use CommandTrait; use ExportTrait; /** diff --git a/src/Command/Config/ExportViewCommand.php b/src/Command/Config/ExportViewCommand.php index 3d715472f..87df39718 100644 --- a/src/Command/Config/ExportViewCommand.php +++ b/src/Command/Config/ExportViewCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Config\CachedStorage; @@ -22,7 +21,6 @@ class ExportViewCommand extends Command { - use CommandTrait; use ModuleTrait; use ExportTrait; diff --git a/src/Command/Config/ImportCommand.php b/src/Command/Config/ImportCommand.php index 08a76de87..90eeb26fa 100644 --- a/src/Command/Config/ImportCommand.php +++ b/src/Command/Config/ImportCommand.php @@ -9,10 +9,9 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Config\CachedStorage; use Drupal\Core\Config\ConfigManager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Core\Config\ConfigImporterException; use Drupal\Core\Config\ConfigImporter; @@ -21,8 +20,6 @@ class ImportCommand extends Command { - use CommandTrait; - /** * @var CachedStorage */ diff --git a/src/Command/Config/ImportSingleCommand.php b/src/Command/Config/ImportSingleCommand.php index 013314ec5..5854fc80a 100644 --- a/src/Command/Config/ImportSingleCommand.php +++ b/src/Command/Config/ImportSingleCommand.php @@ -7,14 +7,13 @@ namespace Drupal\Console\Command\Config; use Drupal\config\StorageReplaceDataWrapper; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Core\Config\CachedStorage; use Drupal\Core\Config\ConfigImporter; use Drupal\Core\Config\ConfigImporterException; use Drupal\Core\Config\ConfigManager; use Drupal\Core\Config\StorageComparer; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -23,8 +22,6 @@ class ImportSingleCommand extends Command { - use CommandTrait; - /** * @var CachedStorage */ diff --git a/src/Command/Config/OverrideCommand.php b/src/Command/Config/OverrideCommand.php index 7d2ad9cc2..e1f1b2beb 100644 --- a/src/Command/Config/OverrideCommand.php +++ b/src/Command/Config/OverrideCommand.php @@ -10,16 +10,13 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Config\CachedStorage; use Drupal\Core\Config\ConfigFactory; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class OverrideCommand extends Command { - use CommandTrait; - /** * @var CachedStorage */ diff --git a/src/Command/Config/ValidateCommand.php b/src/Command/Config/ValidateCommand.php index bf9f5faf3..a356d946c 100644 --- a/src/Command/Config/ValidateCommand.php +++ b/src/Command/Config/ValidateCommand.php @@ -9,8 +9,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Core\Config\TypedConfigManagerInterface; use Symfony\Component\Console\Input\InputArgument; @@ -21,9 +20,8 @@ * * @package Drupal\Console\Command\Config */ -class ValidateCommand extends Command +class ValidateCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; use SchemaCheckTrait; use PrintConfigValidationTrait; diff --git a/src/Command/Create/CommentsCommand.php b/src/Command/Create/CommentsCommand.php index ec8e310a5..4358a8947 100644 --- a/src/Command/Create/CommentsCommand.php +++ b/src/Command/Create/CommentsCommand.php @@ -9,8 +9,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\CreateTrait; use Drupal\Console\Utils\Create\CommentData; use Drupal\Console\Core\Style\DrupalStyle; @@ -23,7 +22,6 @@ class CommentsCommand extends Command { use CreateTrait; - use CommandTrait; /** * @var CommentData diff --git a/src/Command/Create/NodesCommand.php b/src/Command/Create/NodesCommand.php index 0fd33f93f..93d9e6cdc 100644 --- a/src/Command/Create/NodesCommand.php +++ b/src/Command/Create/NodesCommand.php @@ -11,9 +11,8 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Annotations\DrupalCommand; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Command\Shared\CreateTrait; use Drupal\Console\Utils\Create\NodeData; use Drupal\Console\Utils\DrupalApi; @@ -33,7 +32,6 @@ class NodesCommand extends Command { use CreateTrait; - use CommandTrait; /** * @var DrupalApi diff --git a/src/Command/Create/TermsCommand.php b/src/Command/Create/TermsCommand.php index 96cc757f7..213f2e21c 100644 --- a/src/Command/Create/TermsCommand.php +++ b/src/Command/Create/TermsCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Annotations\DrupalCommand; use Drupal\Console\Utils\Create\TermData; use Drupal\Console\Utils\DrupalApi; @@ -30,8 +29,6 @@ */ class TermsCommand extends Command { - use CommandTrait; - /** * @var DrupalApi */ diff --git a/src/Command/Create/UsersCommand.php b/src/Command/Create/UsersCommand.php index 89e91f299..281c886d5 100644 --- a/src/Command/Create/UsersCommand.php +++ b/src/Command/Create/UsersCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\CreateTrait; use Drupal\Console\Utils\Create\UserData; use Drupal\Console\Utils\DrupalApi; @@ -26,7 +25,6 @@ class UsersCommand extends Command { use CreateTrait; - use CommandTrait; /** * @var DrupalApi diff --git a/src/Command/Create/VocabulariesCommand.php b/src/Command/Create/VocabulariesCommand.php index 65087d2f1..a8dca8b90 100644 --- a/src/Command/Create/VocabulariesCommand.php +++ b/src/Command/Create/VocabulariesCommand.php @@ -11,7 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Utils\Create\VocabularyData; use Drupal\Console\Core\Style\DrupalStyle; @@ -22,8 +22,6 @@ */ class VocabulariesCommand extends Command { - use CommandTrait; - /** * @var VocabularyData */ diff --git a/src/Command/Cron/ExecuteCommand.php b/src/Command/Cron/ExecuteCommand.php index 6e6edb636..cb62af297 100644 --- a/src/Command/Cron/ExecuteCommand.php +++ b/src/Command/Cron/ExecuteCommand.php @@ -10,18 +10,15 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Lock\LockBackendInterface; use Drupal\Core\State\StateInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Core\Utils\ChainQueue; class ExecuteCommand extends Command { - use CommandTrait; - /** * @var ModuleHandlerInterface */ diff --git a/src/Command/Cron/ReleaseCommand.php b/src/Command/Cron/ReleaseCommand.php index a4a0ff067..0554cde06 100644 --- a/src/Command/Cron/ReleaseCommand.php +++ b/src/Command/Cron/ReleaseCommand.php @@ -10,7 +10,7 @@ use Symfony\Component\Config\Definition\Exception\Exception; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Lock\LockBackendInterface; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Core\Command\Shared\CommandTrait; @@ -18,8 +18,6 @@ class ReleaseCommand extends Command { - use CommandTrait; - /** * @var LockBackendInterface */ diff --git a/src/Command/Database/AddCommand.php b/src/Command/Database/AddCommand.php index ee9f3591d..38b8593d1 100644 --- a/src/Command/Database/AddCommand.php +++ b/src/Command/Database/AddCommand.php @@ -11,18 +11,15 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Generator\DatabaseSettingsGenerator; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Command\Shared\ConnectTrait; use Drupal\Console\Core\Style\DrupalStyle; class AddCommand extends Command { - use CommandTrait; use ConnectTrait; - /** * @var DatabaseSettingsGenerator */ diff --git a/src/Command/Database/ClientCommand.php b/src/Command/Database/ClientCommand.php index a36af091b..4d679f472 100644 --- a/src/Command/Database/ClientCommand.php +++ b/src/Command/Database/ClientCommand.php @@ -11,15 +11,13 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\ProcessBuilder; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ConnectTrait; use Drupal\Console\Core\Style\DrupalStyle; class ClientCommand extends Command { use ConnectTrait; - use CommandTrait; /** * {@inheritdoc} diff --git a/src/Command/Database/ConnectCommand.php b/src/Command/Database/ConnectCommand.php index caedf4fe6..229b6a1a6 100644 --- a/src/Command/Database/ConnectCommand.php +++ b/src/Command/Database/ConnectCommand.php @@ -10,14 +10,12 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ConnectTrait; use Drupal\Console\Core\Style\DrupalStyle; class ConnectCommand extends Command { - use CommandTrait; use ConnectTrait; /** diff --git a/src/Command/Database/DatabaseLogBase.php b/src/Command/Database/DatabaseLogBase.php index f0d8e5056..7adff8a84 100644 --- a/src/Command/Database/DatabaseLogBase.php +++ b/src/Command/Database/DatabaseLogBase.php @@ -7,14 +7,13 @@ namespace Drupal\Console\Command\Database; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Core\Database\Connection; use Drupal\Core\Datetime\DateFormatterInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\user\UserStorageInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Logger\RfcLogLevel; use Drupal\user\Entity\User; use Drupal\Component\Utility\Unicode; @@ -30,8 +29,6 @@ */ abstract class DatabaseLogBase extends Command { - use CommandTrait; - /** * @var Connection */ diff --git a/src/Command/Database/DropCommand.php b/src/Command/Database/DropCommand.php index 09b67fd22..4e1e736c0 100644 --- a/src/Command/Database/DropCommand.php +++ b/src/Command/Database/DropCommand.php @@ -10,9 +10,8 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Database\Connection; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Command\Shared\ConnectTrait; use Drupal\Console\Core\Style\DrupalStyle; @@ -23,7 +22,6 @@ */ class DropCommand extends Command { - use CommandTrait; use ConnectTrait; /** diff --git a/src/Command/Database/DumpCommand.php b/src/Command/Database/DumpCommand.php index 403f195f2..8aeb7fbd4 100644 --- a/src/Command/Database/DumpCommand.php +++ b/src/Command/Database/DumpCommand.php @@ -11,15 +11,13 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ConnectTrait; use Drupal\Console\Core\Utils\ShellProcess; use Drupal\Console\Core\Style\DrupalStyle; class DumpCommand extends Command { - use CommandTrait; use ConnectTrait; diff --git a/src/Command/Database/LogClearCommand.php b/src/Command/Database/LogClearCommand.php index 266a62bcb..87dcdb536 100644 --- a/src/Command/Database/LogClearCommand.php +++ b/src/Command/Database/LogClearCommand.php @@ -11,7 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Database\Connection; use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Core\Logger\RfcLogLevel; @@ -19,8 +19,6 @@ class LogClearCommand extends Command { - use CommandTrait; - /** * @var Connection */ diff --git a/src/Command/Database/QueryCommand.php b/src/Command/Database/QueryCommand.php index ea9479be9..281dc3aef 100644 --- a/src/Command/Database/QueryCommand.php +++ b/src/Command/Database/QueryCommand.php @@ -17,15 +17,13 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\ProcessBuilder; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ConnectTrait; use Drupal\Console\Core\Style\DrupalStyle; class QueryCommand extends Command { use ConnectTrait; - use CommandTrait; /** * {@inheritdoc} diff --git a/src/Command/Database/RestoreCommand.php b/src/Command/Database/RestoreCommand.php index 4e6c8d6d7..673b8edb0 100644 --- a/src/Command/Database/RestoreCommand.php +++ b/src/Command/Database/RestoreCommand.php @@ -12,14 +12,12 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\ProcessBuilder; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ConnectTrait; use Drupal\Console\Core\Style\DrupalStyle; class RestoreCommand extends Command { - use CommandTrait; use ConnectTrait; /** diff --git a/src/Command/Debug/BreakpointsCommand.php b/src/Command/Debug/BreakpointsCommand.php index 0c6f5603e..acf8d362b 100644 --- a/src/Command/Debug/BreakpointsCommand.php +++ b/src/Command/Debug/BreakpointsCommand.php @@ -10,10 +10,9 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\breakpoint\BreakpointManagerInterface; use Symfony\Component\Yaml\Yaml; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Annotations\DrupalCommand; use Drupal\Console\Core\Style\DrupalStyle; @@ -25,8 +24,6 @@ */ class BreakpointsCommand extends Command { - use CommandTrait; - /** * @var BreakpointManagerInterface */ diff --git a/src/Command/Debug/CacheContextCommand.php b/src/Command/Debug/CacheContextCommand.php index 5ffa1cd08..dbbc5be94 100644 --- a/src/Command/Debug/CacheContextCommand.php +++ b/src/Command/Debug/CacheContextCommand.php @@ -9,8 +9,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -18,10 +17,8 @@ * * @package Drupal\Console\Command\Debug */ -class CacheContextCommand extends Command +class CacheContextCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; - /** * {@inheritdoc} */ diff --git a/src/Command/Debug/ConfigCommand.php b/src/Command/Debug/ConfigCommand.php index d7d4527fb..e73d5f286 100644 --- a/src/Command/Debug/ConfigCommand.php +++ b/src/Command/Debug/ConfigCommand.php @@ -13,14 +13,11 @@ use Drupal\Component\Serialization\Yaml; use Drupal\Core\Config\CachedStorage; use Drupal\Core\Config\ConfigFactory; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; class ConfigCommand extends Command { - use CommandTrait; - /** * @var ConfigFactory */ diff --git a/src/Command/Debug/ConfigSettingsCommand.php b/src/Command/Debug/ConfigSettingsCommand.php index 0ce42485e..503d41719 100644 --- a/src/Command/Debug/ConfigSettingsCommand.php +++ b/src/Command/Debug/ConfigSettingsCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Output\OutputInterface; use Drupal\Component\Serialization\Yaml; use Drupal\Console\Core\Style\DrupalStyle; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Site\Settings; /** @@ -22,8 +21,6 @@ */ class ConfigSettingsCommand extends Command { - use CommandTrait; - /** * @var Settings */ diff --git a/src/Command/Debug/ConfigValidateCommand.php b/src/Command/Debug/ConfigValidateCommand.php index 451679a74..9c23f669c 100644 --- a/src/Command/Debug/ConfigValidateCommand.php +++ b/src/Command/Debug/ConfigValidateCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; use Symfony\Component\Console\Input\InputArgument; use Drupal\Core\Config\TypedConfigManagerInterface; @@ -24,9 +23,8 @@ * *@package Drupal\Console\Command\Debug */ -class ConfigValidateCommand extends Command +class ConfigValidateCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; use SchemaCheckTrait; use PrintConfigValidationTrait; diff --git a/src/Command/Debug/ContainerCommand.php b/src/Command/Debug/ContainerCommand.php index a8630cef2..03255a54f 100644 --- a/src/Command/Debug/ContainerCommand.php +++ b/src/Command/Debug/ContainerCommand.php @@ -11,9 +11,8 @@ use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Symfony\Component\Yaml\Yaml; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -21,10 +20,8 @@ * * @package Drupal\Console\Command\Debug */ -class ContainerCommand extends Command +class ContainerCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; - /** * {@inheritdoc} */ diff --git a/src/Command/Debug/CronCommand.php b/src/Command/Debug/CronCommand.php index 623d989b3..9b7f7d649 100644 --- a/src/Command/Debug/CronCommand.php +++ b/src/Command/Debug/CronCommand.php @@ -9,15 +9,12 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Extension\ModuleHandlerInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class CronCommand extends Command { - use CommandTrait; - /** * @var ModuleHandlerInterface */ diff --git a/src/Command/Debug/DatabaseTableCommand.php b/src/Command/Debug/DatabaseTableCommand.php index 8746b4a69..88a77c2d2 100644 --- a/src/Command/Debug/DatabaseTableCommand.php +++ b/src/Command/Debug/DatabaseTableCommand.php @@ -11,10 +11,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use RedBeanPHP\R; use Drupal\Core\Database\Connection; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Command\Shared\ConnectTrait; @@ -25,7 +24,6 @@ */ class DatabaseTableCommand extends Command { - use CommandTrait; use ConnectTrait; /** diff --git a/src/Command/Debug/EntityCommand.php b/src/Command/Debug/EntityCommand.php index 803f9f275..ff1a74c07 100644 --- a/src/Command/Debug/EntityCommand.php +++ b/src/Command/Debug/EntityCommand.php @@ -9,16 +9,13 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeRepository; use Drupal\Core\Entity\EntityTypeManagerInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class EntityCommand extends Command { - use CommandTrait; - /** * @var EntityTypeRepository */ diff --git a/src/Command/Debug/EventCommand.php b/src/Command/Debug/EventCommand.php index 5d27e01a6..126e9bc57 100644 --- a/src/Command/Debug/EventCommand.php +++ b/src/Command/Debug/EventCommand.php @@ -10,9 +10,8 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Yaml\Yaml; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -22,8 +21,6 @@ */ class EventCommand extends Command { - use CommandTrait; - protected $eventDispatcher; /** diff --git a/src/Command/Debug/FeaturesCommand.php b/src/Command/Debug/FeaturesCommand.php index a94806058..bcb3bc3f9 100644 --- a/src/Command/Debug/FeaturesCommand.php +++ b/src/Command/Debug/FeaturesCommand.php @@ -11,10 +11,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Drupal\Console\Command\Shared\FeatureTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Annotations\DrupalCommand; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; /** * @DrupalCommand( @@ -25,7 +24,6 @@ class FeaturesCommand extends Command { - use CommandTrait; use FeatureTrait; protected function configure() diff --git a/src/Command/Debug/ImageStylesCommand.php b/src/Command/Debug/ImageStylesCommand.php index 0bf1bb6a9..1a6ecbda7 100644 --- a/src/Command/Debug/ImageStylesCommand.php +++ b/src/Command/Debug/ImageStylesCommand.php @@ -9,9 +9,8 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeManagerInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -21,8 +20,6 @@ */ class ImageStylesCommand extends Command { - use CommandTrait; - /** * @var EntityTypeManagerInterface */ diff --git a/src/Command/Debug/LibrariesCommand.php b/src/Command/Debug/LibrariesCommand.php index 41875a71f..afd5b58a2 100644 --- a/src/Command/Debug/LibrariesCommand.php +++ b/src/Command/Debug/LibrariesCommand.php @@ -10,18 +10,15 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Extension\ThemeHandlerInterface; use Drupal\Core\Asset\LibraryDiscoveryInterface; use Drupal\Component\Serialization\Yaml; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class LibrariesCommand extends Command { - use CommandTrait; - /** * @var ModuleHandlerInterface */ diff --git a/src/Command/Debug/MigrateCommand.php b/src/Command/Debug/MigrateCommand.php index 9b2f8b20d..ecaab1a85 100644 --- a/src/Command/Debug/MigrateCommand.php +++ b/src/Command/Debug/MigrateCommand.php @@ -13,8 +13,7 @@ use Drupal\Console\Command\Shared\MigrationTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Annotations\DrupalCommand; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\migrate\Plugin\MigrationPluginManagerInterface; /** @@ -26,7 +25,6 @@ class MigrateCommand extends Command { use MigrationTrait; - use CommandTrait; /** * @var MigrationPluginManagerInterface $pluginManagerMigration diff --git a/src/Command/Debug/ModuleCommand.php b/src/Command/Debug/ModuleCommand.php index 4a8767abc..21417aeb6 100644 --- a/src/Command/Debug/ModuleCommand.php +++ b/src/Command/Debug/ModuleCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Utils\Site; use GuzzleHttp\Client; @@ -20,8 +19,6 @@ class ModuleCommand extends Command { - use CommandTrait; - /** * @var ConfigurationManager */ diff --git a/src/Command/Debug/MultisiteCommand.php b/src/Command/Debug/MultisiteCommand.php index 333af16b0..6dcf18064 100644 --- a/src/Command/Debug/MultisiteCommand.php +++ b/src/Command/Debug/MultisiteCommand.php @@ -9,8 +9,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -20,8 +19,6 @@ */ class MultisiteCommand extends Command { - use CommandTrait; - protected $appRoot; /** diff --git a/src/Command/Debug/PermissionCommand.php b/src/Command/Debug/PermissionCommand.php index 8481ab8b2..759bd069c 100644 --- a/src/Command/Debug/PermissionCommand.php +++ b/src/Command/Debug/PermissionCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -19,9 +18,8 @@ * * @package Drupal\Console\Command\Debug */ -class PermissionCommand extends Command +class PermissionCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; /** * {@inheritdoc} */ diff --git a/src/Command/Debug/PluginCommand.php b/src/Command/Debug/PluginCommand.php index 408c94d4e..bc6e9096b 100644 --- a/src/Command/Debug/PluginCommand.php +++ b/src/Command/Debug/PluginCommand.php @@ -10,9 +10,8 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputArgument; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Symfony\Component\Yaml\Yaml; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -20,9 +19,8 @@ * * @package Drupal\Console\Command\Debug */ -class PluginCommand extends Command +class PluginCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; /** * {@inheritdoc} */ diff --git a/src/Command/Debug/QueueCommand.php b/src/Command/Debug/QueueCommand.php index 69af8bdff..e4907a260 100644 --- a/src/Command/Debug/QueueCommand.php +++ b/src/Command/Debug/QueueCommand.php @@ -7,11 +7,10 @@ namespace Drupal\Console\Command\Debug; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Drupal\Core\Queue\QueueWorkerManagerInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -21,8 +20,6 @@ */ class QueueCommand extends Command { - use CommandTrait; - /** * @var QueueWorkerManagerInterface */ diff --git a/src/Command/Debug/RestCommand.php b/src/Command/Debug/RestCommand.php index ad1205800..1497365da 100644 --- a/src/Command/Debug/RestCommand.php +++ b/src/Command/Debug/RestCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Annotations\DrupalCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Command\Shared\RestTrait; @@ -26,7 +25,6 @@ */ class RestCommand extends Command { - use CommandTrait; use RestTrait; /** diff --git a/src/Command/Debug/RouterCommand.php b/src/Command/Debug/RouterCommand.php index a5e28fda8..726f0bdc7 100644 --- a/src/Command/Debug/RouterCommand.php +++ b/src/Command/Debug/RouterCommand.php @@ -10,16 +10,13 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Routing\RouteProviderInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Component\Serialization\Yaml; class RouterCommand extends Command { - use CommandTrait; - /** * @var RouteProviderInterface */ diff --git a/src/Command/Debug/StateCommand.php b/src/Command/Debug/StateCommand.php index 60c06b745..88fc5dacd 100644 --- a/src/Command/Debug/StateCommand.php +++ b/src/Command/Debug/StateCommand.php @@ -10,10 +10,9 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\KeyValueStore\KeyValueFactoryInterface; use Drupal\Core\State\StateInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Component\Serialization\Yaml; @@ -24,8 +23,6 @@ */ class StateCommand extends Command { - use CommandTrait; - /** * @var StateInterface */ diff --git a/src/Command/Debug/TestCommand.php b/src/Command/Debug/TestCommand.php index e18c784a5..1985b50e4 100644 --- a/src/Command/Debug/TestCommand.php +++ b/src/Command/Debug/TestCommand.php @@ -12,8 +12,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Drupal\Component\Serialization\Yaml; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Annotations\DrupalCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\simpletest\TestDiscovery; @@ -26,8 +25,6 @@ */ class TestCommand extends Command { - use CommandTrait; - /** * @var TestDiscovery */ diff --git a/src/Command/Debug/ThemeCommand.php b/src/Command/Debug/ThemeCommand.php index 601228947..84a68ce23 100644 --- a/src/Command/Debug/ThemeCommand.php +++ b/src/Command/Debug/ThemeCommand.php @@ -10,16 +10,13 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Config\ConfigFactory; use Drupal\Core\Extension\ThemeHandler; use Drupal\Console\Core\Style\DrupalStyle; class ThemeCommand extends Command { - use CommandTrait; - /** * @var ConfigFactory */ diff --git a/src/Command/Debug/UpdateCommand.php b/src/Command/Debug/UpdateCommand.php index f61a3684e..6aebfccaa 100644 --- a/src/Command/Debug/UpdateCommand.php +++ b/src/Command/Debug/UpdateCommand.php @@ -9,16 +9,13 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Update\UpdateRegistry; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Utils\Site; use Drupal\Console\Core\Style\DrupalStyle; class UpdateCommand extends Command { - use CommandTrait; - /** * @var Site */ diff --git a/src/Command/Debug/UserCommand.php b/src/Command/Debug/UserCommand.php index a453c578e..48a73c59a 100644 --- a/src/Command/Debug/UserCommand.php +++ b/src/Command/Debug/UserCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\Query\QueryFactory; use Drupal\Console\Core\Style\DrupalStyle; @@ -24,8 +23,6 @@ */ class UserCommand extends Command { - use CommandTrait; - /** * @var EntityTypeManagerInterface */ diff --git a/src/Command/Debug/ViewsCommand.php b/src/Command/Debug/ViewsCommand.php index b11e98c83..4f0a0016d 100644 --- a/src/Command/Debug/ViewsCommand.php +++ b/src/Command/Debug/ViewsCommand.php @@ -11,9 +11,8 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\views\Entity\View; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Console\Core\Style\DrupalStyle; @@ -24,8 +23,6 @@ */ class ViewsCommand extends Command { - use CommandTrait; - /** * @var EntityTypeManagerInterface */ diff --git a/src/Command/Debug/ViewsPluginsCommand.php b/src/Command/Debug/ViewsPluginsCommand.php index 728e465b8..8a86774e5 100644 --- a/src/Command/Debug/ViewsPluginsCommand.php +++ b/src/Command/Debug/ViewsPluginsCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\views\Views; @@ -20,9 +19,8 @@ * * @package Drupal\Console\Command\Debug */ -class ViewsPluginsCommand extends Command +class ViewsPluginsCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; /** * {@inheritdoc} */ diff --git a/src/Command/DevelDumperCommand.php b/src/Command/DevelDumperCommand.php index 612b52e73..f19d0412e 100644 --- a/src/Command/DevelDumperCommand.php +++ b/src/Command/DevelDumperCommand.php @@ -7,8 +7,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\devel\DevelDumperPluginManager; use Drupal\devel\DevelDumperManager; @@ -23,10 +22,8 @@ * @todo Move to namespace Devel * @todo Load devel.module legacy file */ -class DevelDumperCommand extends Command +class DevelDumperCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; - /** * @var DevelDumperPluginManager */ diff --git a/src/Command/Entity/DeleteCommand.php b/src/Command/Entity/DeleteCommand.php index 561e5a5b6..f9b1ecbb4 100644 --- a/src/Command/Entity/DeleteCommand.php +++ b/src/Command/Entity/DeleteCommand.php @@ -9,16 +9,13 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeRepository; use Drupal\Core\Entity\EntityTypeManagerInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class DeleteCommand extends Command { - use CommandTrait; - /** * @var EntityTypeRepository */ diff --git a/src/Command/Features/ImportCommand.php b/src/Command/Features/ImportCommand.php index e315b9d90..01ef819a7 100644 --- a/src/Command/Features/ImportCommand.php +++ b/src/Command/Features/ImportCommand.php @@ -12,10 +12,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Drupal\Console\Command\Shared\FeatureTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Annotations\DrupalCommand; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; /** * @DrupalCommand( @@ -26,7 +25,6 @@ class ImportCommand extends Command { - use CommandTrait; use FeatureTrait; public function __construct() diff --git a/src/Command/Field/InfoCommand.php b/src/Command/Field/InfoCommand.php index 002359d48..6c57302b0 100644 --- a/src/Command/Field/InfoCommand.php +++ b/src/Command/Field/InfoCommand.php @@ -10,11 +10,10 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityFieldManagerInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\field\FieldConfigInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -22,8 +21,6 @@ */ class InfoCommand extends Command { - use CommandTrait; - /** * @var EntityTypeManagerInterface */ diff --git a/src/Command/Generate/AuthenticationProviderCommand.php b/src/Command/Generate/AuthenticationProviderCommand.php index 8e6e2a027..3e608fd05 100644 --- a/src/Command/Generate/AuthenticationProviderCommand.php +++ b/src/Command/Generate/AuthenticationProviderCommand.php @@ -13,11 +13,10 @@ use Drupal\Console\Command\Shared\ServicesTrait; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\FormTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Generator\AuthenticationProviderGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Extension\Manager; @@ -27,7 +26,6 @@ class AuthenticationProviderCommand extends Command use ModuleTrait; use FormTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/BreakPointCommand.php b/src/Command/Generate/BreakPointCommand.php index dcce46b0f..d4582c55f 100644 --- a/src/Command/Generate/BreakPointCommand.php +++ b/src/Command/Generate/BreakPointCommand.php @@ -10,12 +10,11 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Extension\ThemeHandler; use Drupal\Console\Command\Shared\ThemeRegionTrait; use Drupal\Console\Command\Shared\ThemeBreakpointTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Utils\Validator; use Drupal\Console\Core\Utils\StringConverter; @@ -26,7 +25,6 @@ */ class BreakPointCommand extends Command { - use CommandTrait; use ConfirmationTrait; use ThemeRegionTrait; use ThemeBreakpointTrait; diff --git a/src/Command/Generate/CacheContextCommand.php b/src/Command/Generate/CacheContextCommand.php index 868b77690..f9445c5e7 100644 --- a/src/Command/Generate/CacheContextCommand.php +++ b/src/Command/Generate/CacheContextCommand.php @@ -13,19 +13,17 @@ use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Generator\CacheContextGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Extension\Manager; use Drupal\Console\Command\Shared\ServicesTrait; use Drupal\Console\Core\Utils\StringConverter; -class CacheContextCommand extends Command +class CacheContextCommand extends ContainerAwareCommand { use ModuleTrait; use ConfirmationTrait; - use ContainerAwareCommandTrait; use ServicesTrait; /** diff --git a/src/Command/Generate/CommandCommand.php b/src/Command/Generate/CommandCommand.php index 9417653e5..e0e15b128 100644 --- a/src/Command/Generate/CommandCommand.php +++ b/src/Command/Generate/CommandCommand.php @@ -12,8 +12,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Generator\CommandGenerator; @@ -23,9 +22,9 @@ use Drupal\Console\Utils\Validator; use Drupal\Console\Utils\Site; -class CommandCommand extends Command +class CommandCommand extends ContainerAwareCommand + { - use ContainerAwareCommandTrait; use ConfirmationTrait; use ServicesTrait; use ModuleTrait; diff --git a/src/Command/Generate/ControllerCommand.php b/src/Command/Generate/ControllerCommand.php index 923f91519..730fd5ee6 100644 --- a/src/Command/Generate/ControllerCommand.php +++ b/src/Command/Generate/ControllerCommand.php @@ -14,23 +14,21 @@ use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Generator\ControllerGenerator; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Core\Routing\RouteProviderInterface; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Core\Utils\StringConverter; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Core\Command\Shared\InputTrait; use Drupal\Console\Extension\Manager; use Drupal\Console\Utils\Validator; -class ControllerCommand extends Command +class ControllerCommand extends ContainerAwareCommand { use ModuleTrait; use ServicesTrait; use ConfirmationTrait; use InputTrait; - use ContainerAwareCommandTrait; /** * @var Manager diff --git a/src/Command/Generate/EntityBundleCommand.php b/src/Command/Generate/EntityBundleCommand.php index 2a9ef6897..544f9441b 100644 --- a/src/Command/Generate/EntityBundleCommand.php +++ b/src/Command/Generate/EntityBundleCommand.php @@ -7,14 +7,13 @@ namespace Drupal\Console\Command\Generate; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ServicesTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Generator\EntityBundleGenerator; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; @@ -22,7 +21,6 @@ class EntityBundleCommand extends Command { - use CommandTrait; use ModuleTrait; use ServicesTrait; use ConfirmationTrait; diff --git a/src/Command/Generate/EntityCommand.php b/src/Command/Generate/EntityCommand.php index d5869edc7..265872f00 100644 --- a/src/Command/Generate/EntityCommand.php +++ b/src/Command/Generate/EntityCommand.php @@ -10,14 +10,12 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ModuleTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; abstract class EntityCommand extends Command { - use CommandTrait; use ModuleTrait; private $entityType; private $commandName; diff --git a/src/Command/Generate/EventSubscriberCommand.php b/src/Command/Generate/EventSubscriberCommand.php index b4f8b29fb..5554a84fd 100644 --- a/src/Command/Generate/EventSubscriberCommand.php +++ b/src/Command/Generate/EventSubscriberCommand.php @@ -15,21 +15,19 @@ use Drupal\Console\Generator\EventSubscriberGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Command\Shared\EventsTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Extension\Manager; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Drupal\Console\Core\Utils\ChainQueue; -class EventSubscriberCommand extends Command +class EventSubscriberCommand extends ContainerAwareCommand { use EventsTrait; use ServicesTrait; use ModuleTrait; use ConfirmationTrait; - use ContainerAwareCommandTrait; /** * @var Manager diff --git a/src/Command/Generate/FormAlterCommand.php b/src/Command/Generate/FormAlterCommand.php index 4c3d876f7..e614a139c 100644 --- a/src/Command/Generate/FormAlterCommand.php +++ b/src/Command/Generate/FormAlterCommand.php @@ -16,9 +16,8 @@ use Drupal\Console\Command\Shared\MenuTrait; use Drupal\Console\Command\Shared\FormTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Extension\Manager; use Drupal\Core\Extension\ModuleHandlerInterface; @@ -35,7 +34,6 @@ class FormAlterCommand extends Command use FormTrait; use MenuTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/FormCommand.php b/src/Command/Generate/FormCommand.php index 1eec424d5..7ddc23dd2 100644 --- a/src/Command/Generate/FormCommand.php +++ b/src/Command/Generate/FormCommand.php @@ -14,9 +14,8 @@ use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\MenuTrait; use Drupal\Console\Command\Shared\FormTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Generator\FormGenerator; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\ChainQueue; @@ -24,9 +23,8 @@ use Drupal\Core\Render\ElementInfoManager; use Drupal\Core\Routing\RouteProviderInterface; -abstract class FormCommand extends Command +abstract class FormCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; use ModuleTrait; use ServicesTrait; use FormTrait; diff --git a/src/Command/Generate/HelpCommand.php b/src/Command/Generate/HelpCommand.php index 282aee5f6..8618ed620 100644 --- a/src/Command/Generate/HelpCommand.php +++ b/src/Command/Generate/HelpCommand.php @@ -10,11 +10,10 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Generator\HelpGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Utils\Site; @@ -22,7 +21,6 @@ class HelpCommand extends Command { - use CommandTrait; use ModuleTrait; use ConfirmationTrait; diff --git a/src/Command/Generate/ModuleCommand.php b/src/Command/Generate/ModuleCommand.php index 215909eea..2956270f8 100644 --- a/src/Command/Generate/ModuleCommand.php +++ b/src/Command/Generate/ModuleCommand.php @@ -13,17 +13,15 @@ use Symfony\Component\Console\Output\OutputInterface; use Drupal\Console\Generator\ModuleGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Utils\Validator; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Utils\DrupalApi; class ModuleCommand extends Command { use ConfirmationTrait; - use CommandTrait; /** * @var ModuleGenerator diff --git a/src/Command/Generate/ModuleFileCommand.php b/src/Command/Generate/ModuleFileCommand.php index 8d8eca01d..e4d3ed480 100644 --- a/src/Command/Generate/ModuleFileCommand.php +++ b/src/Command/Generate/ModuleFileCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Generator\ModuleFileGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Command\Shared\ModuleTrait; @@ -25,7 +24,6 @@ */ class ModuleFileCommand extends Command { - use CommandTrait; use ConfirmationTrait; use ModuleTrait; diff --git a/src/Command/Generate/PermissionCommand.php b/src/Command/Generate/PermissionCommand.php index a7aee3778..3dfa053e0 100644 --- a/src/Command/Generate/PermissionCommand.php +++ b/src/Command/Generate/PermissionCommand.php @@ -10,19 +10,17 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\PermissionTrait; use Drupal\Console\Generator\PermissionGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\StringConverter; class PermissionCommand extends Command { - use CommandTrait; use ModuleTrait; use PermissionTrait; use ConfirmationTrait; diff --git a/src/Command/Generate/PluginBlockCommand.php b/src/Command/Generate/PluginBlockCommand.php index 21679d997..eec339549 100644 --- a/src/Command/Generate/PluginBlockCommand.php +++ b/src/Command/Generate/PluginBlockCommand.php @@ -10,13 +10,12 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Generator\PluginBlockGenerator; use Drupal\Console\Command\Shared\ServicesTrait; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\FormTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Extension\Manager; use Drupal\Console\Utils\Validator; use Drupal\Console\Core\Utils\StringConverter; @@ -26,13 +25,12 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Render\ElementInfoManagerInterface; -class PluginBlockCommand extends Command +class PluginBlockCommand extends ContainerAwareCommand { use ServicesTrait; use ModuleTrait; use FormTrait; use ConfirmationTrait; - use ContainerAwareCommandTrait; /** * @var ConfigFactory diff --git a/src/Command/Generate/PluginCKEditorButtonCommand.php b/src/Command/Generate/PluginCKEditorButtonCommand.php index f73f9bda8..d0bbd7aca 100644 --- a/src/Command/Generate/PluginCKEditorButtonCommand.php +++ b/src/Command/Generate/PluginCKEditorButtonCommand.php @@ -10,11 +10,10 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Generator\PluginCKEditorButtonGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Extension\Manager; @@ -22,7 +21,6 @@ class PluginCKEditorButtonCommand extends Command { - use CommandTrait; use ModuleTrait; use ConfirmationTrait; diff --git a/src/Command/Generate/PluginConditionCommand.php b/src/Command/Generate/PluginConditionCommand.php index 20d44a924..7b1cbbcfe 100644 --- a/src/Command/Generate/PluginConditionCommand.php +++ b/src/Command/Generate/PluginConditionCommand.php @@ -10,9 +10,8 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeRepository; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Generator\PluginConditionGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; @@ -28,7 +27,6 @@ */ class PluginConditionCommand extends Command { - use CommandTrait; use ModuleTrait; use ConfirmationTrait; diff --git a/src/Command/Generate/PluginFieldCommand.php b/src/Command/Generate/PluginFieldCommand.php index 965b54841..28925e10f 100644 --- a/src/Command/Generate/PluginFieldCommand.php +++ b/src/Command/Generate/PluginFieldCommand.php @@ -12,10 +12,9 @@ use Symfony\Component\Console\Output\OutputInterface; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Utils\ChainQueue; @@ -23,7 +22,6 @@ class PluginFieldCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginFieldFormatterCommand.php b/src/Command/Generate/PluginFieldFormatterCommand.php index 627ae163e..0befc9ffd 100644 --- a/src/Command/Generate/PluginFieldFormatterCommand.php +++ b/src/Command/Generate/PluginFieldFormatterCommand.php @@ -13,11 +13,10 @@ use Drupal\Console\Generator\PluginFieldFormatterGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Core\Field\FieldTypePluginManager; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Utils\ChainQueue; @@ -30,7 +29,6 @@ class PluginFieldFormatterCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginFieldTypeCommand.php b/src/Command/Generate/PluginFieldTypeCommand.php index cd7b9c64b..157a1e908 100644 --- a/src/Command/Generate/PluginFieldTypeCommand.php +++ b/src/Command/Generate/PluginFieldTypeCommand.php @@ -13,10 +13,9 @@ use Drupal\Console\Generator\PluginFieldTypeGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Core\Field\FieldTypePluginManager; @@ -30,7 +29,6 @@ class PluginFieldTypeCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginFieldWidgetCommand.php b/src/Command/Generate/PluginFieldWidgetCommand.php index a56213756..c61ea6cac 100644 --- a/src/Command/Generate/PluginFieldWidgetCommand.php +++ b/src/Command/Generate/PluginFieldWidgetCommand.php @@ -13,10 +13,9 @@ use Drupal\Console\Generator\PluginFieldWidgetGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Core\Field\FieldTypePluginManager; @@ -30,7 +29,6 @@ class PluginFieldWidgetCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginImageEffectCommand.php b/src/Command/Generate/PluginImageEffectCommand.php index df33700e9..68ca5463c 100644 --- a/src/Command/Generate/PluginImageEffectCommand.php +++ b/src/Command/Generate/PluginImageEffectCommand.php @@ -13,10 +13,9 @@ use Drupal\Console\Generator\PluginImageEffectGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Utils\ChainQueue; @@ -29,7 +28,6 @@ class PluginImageEffectCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginImageFormatterCommand.php b/src/Command/Generate/PluginImageFormatterCommand.php index 5a3cb696f..07636c997 100644 --- a/src/Command/Generate/PluginImageFormatterCommand.php +++ b/src/Command/Generate/PluginImageFormatterCommand.php @@ -13,10 +13,9 @@ use Drupal\Console\Generator\PluginImageFormatterGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Utils\Validator; use Drupal\Console\Core\Utils\ChainQueue; @@ -25,7 +24,6 @@ class PluginImageFormatterCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginMailCommand.php b/src/Command/Generate/PluginMailCommand.php index e461ea85a..cf983fb74 100644 --- a/src/Command/Generate/PluginMailCommand.php +++ b/src/Command/Generate/PluginMailCommand.php @@ -15,10 +15,9 @@ use Drupal\Console\Command\Shared\FormTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Generator\PluginMailGenerator; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Utils\Validator; use Drupal\Console\Core\Utils\ChainQueue; @@ -28,13 +27,12 @@ * * @package Drupal\Console\Command\Generate */ -class PluginMailCommand extends Command +class PluginMailCommand extends ContainerAwareCommand { use ServicesTrait; use ModuleTrait; use FormTrait; use ConfirmationTrait; - use ContainerAwareCommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginMigrateProcessCommand.php b/src/Command/Generate/PluginMigrateProcessCommand.php index cf705508c..14aaae194 100644 --- a/src/Command/Generate/PluginMigrateProcessCommand.php +++ b/src/Command/Generate/PluginMigrateProcessCommand.php @@ -10,21 +10,19 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Generator\PluginMigrateProcessGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Core\Utils\ChainQueue; -class PluginMigrateProcessCommand extends Command +class PluginMigrateProcessCommand extends ContainerAwareCommand { use ModuleTrait; use ConfirmationTrait; - use ContainerAwareCommandTrait; /** * @var PluginMigrateProcessGenerator diff --git a/src/Command/Generate/PluginMigrateSourceCommand.php b/src/Command/Generate/PluginMigrateSourceCommand.php index 603b0679c..5fd86db3b 100644 --- a/src/Command/Generate/PluginMigrateSourceCommand.php +++ b/src/Command/Generate/PluginMigrateSourceCommand.php @@ -10,11 +10,10 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Generator\PluginMigrateSourceGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Extension\Manager; use Drupal\Console\Utils\Validator; use Drupal\Console\Core\Utils\StringConverter; @@ -24,11 +23,10 @@ use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Render\ElementInfoManagerInterface; -class PluginMigrateSourceCommand extends Command +class PluginMigrateSourceCommand extends ContainerAwareCommand { use ModuleTrait; use ConfirmationTrait; - use ContainerAwareCommandTrait; /** * @var ConfigFactory diff --git a/src/Command/Generate/PluginRestResourceCommand.php b/src/Command/Generate/PluginRestResourceCommand.php index c11e9685d..e10a6a892 100644 --- a/src/Command/Generate/PluginRestResourceCommand.php +++ b/src/Command/Generate/PluginRestResourceCommand.php @@ -15,10 +15,9 @@ use Drupal\Console\Command\Shared\FormTrait; use Drupal\Console\Generator\PluginRestResourceGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Utils\ChainQueue; @@ -33,7 +32,6 @@ class PluginRestResourceCommand extends Command use ModuleTrait; use FormTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginRulesActionCommand.php b/src/Command/Generate/PluginRulesActionCommand.php index 6a063f2b7..fbdfe2575 100644 --- a/src/Command/Generate/PluginRulesActionCommand.php +++ b/src/Command/Generate/PluginRulesActionCommand.php @@ -15,10 +15,9 @@ use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\FormTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Utils\ChainQueue; @@ -33,7 +32,6 @@ class PluginRulesActionCommand extends Command use ModuleTrait; use FormTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginSkeletonCommand.php b/src/Command/Generate/PluginSkeletonCommand.php index 01a3dfa00..c86568b0e 100644 --- a/src/Command/Generate/PluginSkeletonCommand.php +++ b/src/Command/Generate/PluginSkeletonCommand.php @@ -11,13 +11,12 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Command\Shared\ServicesTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Utils\Validator; @@ -27,12 +26,11 @@ * * @package Drupal\Console\Command\Generate */ -class PluginSkeletonCommand extends Command +class PluginSkeletonCommand extends ContainerAwareCommand { use ModuleTrait; use ConfirmationTrait; use ServicesTrait; - use ContainerAwareCommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginTypeAnnotationCommand.php b/src/Command/Generate/PluginTypeAnnotationCommand.php index 93bd76d82..9454cb877 100644 --- a/src/Command/Generate/PluginTypeAnnotationCommand.php +++ b/src/Command/Generate/PluginTypeAnnotationCommand.php @@ -15,9 +15,8 @@ use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\FormTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\StringConverter; @@ -32,7 +31,6 @@ class PluginTypeAnnotationCommand extends Command use ModuleTrait; use FormTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginTypeYamlCommand.php b/src/Command/Generate/PluginTypeYamlCommand.php index 3674b6ec4..d1987bebb 100644 --- a/src/Command/Generate/PluginTypeYamlCommand.php +++ b/src/Command/Generate/PluginTypeYamlCommand.php @@ -15,10 +15,9 @@ use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\FormTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Core\Utils\ChainQueue; @@ -33,7 +32,6 @@ class PluginTypeYamlCommand extends Command use ModuleTrait; use FormTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/PluginViewsFieldCommand.php b/src/Command/Generate/PluginViewsFieldCommand.php index b91b08ad8..f0e0f971c 100644 --- a/src/Command/Generate/PluginViewsFieldCommand.php +++ b/src/Command/Generate/PluginViewsFieldCommand.php @@ -13,11 +13,10 @@ use Drupal\Console\Generator\PluginViewsFieldGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\ChainQueue; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Utils\Site; use Drupal\Console\Core\Utils\StringConverter; @@ -30,8 +29,6 @@ class PluginViewsFieldCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; - /** * @var Manager diff --git a/src/Command/Generate/PostUpdateCommand.php b/src/Command/Generate/PostUpdateCommand.php index 0cad7f377..24b40fbae 100644 --- a/src/Command/Generate/PostUpdateCommand.php +++ b/src/Command/Generate/PostUpdateCommand.php @@ -13,11 +13,10 @@ use Drupal\Console\Generator\PostUpdateGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\ChainQueue; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Utils\Site; use Drupal\Console\Utils\Validator; @@ -30,7 +29,6 @@ class PostUpdateCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/ProfileCommand.php b/src/Command/Generate/ProfileCommand.php index f26791ae2..60e93dd96 100644 --- a/src/Command/Generate/ProfileCommand.php +++ b/src/Command/Generate/ProfileCommand.php @@ -8,13 +8,12 @@ namespace Drupal\Console\Command\Generate; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Generator\ProfileGenerator; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\StringConverter; use Drupal\Console\Utils\Validator; @@ -28,7 +27,6 @@ class ProfileCommand extends Command { use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/RouteSubscriberCommand.php b/src/Command/Generate/RouteSubscriberCommand.php index acc64fdd9..a6b11d5f1 100644 --- a/src/Command/Generate/RouteSubscriberCommand.php +++ b/src/Command/Generate/RouteSubscriberCommand.php @@ -13,11 +13,10 @@ use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Generator\RouteSubscriberGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\ChainQueue; -use Drupal\Console\Core\Command\Shared\CommandTrait; /** * Class RouteSubscriberCommand @@ -28,7 +27,6 @@ class RouteSubscriberCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/ServiceCommand.php b/src/Command/Generate/ServiceCommand.php index 859bcfe1b..e6563dbe5 100644 --- a/src/Command/Generate/ServiceCommand.php +++ b/src/Command/Generate/ServiceCommand.php @@ -14,9 +14,8 @@ use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Generator\ServiceGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Core\Utils\StringConverter; @@ -26,12 +25,11 @@ * * @package Drupal\Console\Command\Generate */ -class ServiceCommand extends Command +class ServiceCommand extends ContainerAwareCommand { use ServicesTrait; use ModuleTrait; use ConfirmationTrait; - use ContainerAwareCommandTrait; /** * @var Manager diff --git a/src/Command/Generate/ThemeCommand.php b/src/Command/Generate/ThemeCommand.php index e92af8d1f..2156e9381 100644 --- a/src/Command/Generate/ThemeCommand.php +++ b/src/Command/Generate/ThemeCommand.php @@ -14,12 +14,11 @@ use Drupal\Console\Command\Shared\ThemeBreakpointTrait; use Drupal\Console\Generator\ThemeGenerator; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; use Drupal\Console\Utils\Site; use Drupal\Console\Core\Utils\StringConverter; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Utils\Validator; use Drupal\Core\Extension\ThemeHandler; @@ -33,7 +32,6 @@ class ThemeCommand extends Command use ConfirmationTrait; use ThemeRegionTrait; use ThemeBreakpointTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Generate/TwigExtensionCommand.php b/src/Command/Generate/TwigExtensionCommand.php index a4f6a72d4..d91cfe6c4 100644 --- a/src/Command/Generate/TwigExtensionCommand.php +++ b/src/Command/Generate/TwigExtensionCommand.php @@ -6,7 +6,7 @@ namespace Drupal\Console\Command\Generate; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ServicesTrait; @@ -19,19 +19,17 @@ use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Utils\Site; use Drupal\Console\Core\Utils\StringConverter; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; /** * Class TwigExtensionCommand * * @package Drupal\Console\Command\Generate */ -class TwigExtensionCommand extends Command +class TwigExtensionCommand extends ContainerAwareCommand { use ModuleTrait; use ServicesTrait; use ConfirmationTrait; - use ContainerAwareCommandTrait; /** * @var Manager diff --git a/src/Command/Generate/UpdateCommand.php b/src/Command/Generate/UpdateCommand.php index 257845522..f3b41ad16 100644 --- a/src/Command/Generate/UpdateCommand.php +++ b/src/Command/Generate/UpdateCommand.php @@ -13,8 +13,7 @@ use Drupal\Console\Generator\UpdateGenerator; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Utils\ChainQueue; @@ -29,7 +28,6 @@ class UpdateCommand extends Command { use ModuleTrait; use ConfirmationTrait; - use CommandTrait; /** * @var Manager diff --git a/src/Command/Image/StylesFlushCommand.php b/src/Command/Image/StylesFlushCommand.php index cd85dea71..c9b267a6a 100644 --- a/src/Command/Image/StylesFlushCommand.php +++ b/src/Command/Image/StylesFlushCommand.php @@ -9,15 +9,12 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeManagerInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class StylesFlushCommand extends Command { - use CommandTrait; - /** * @var EntityTypeManagerInterface */ diff --git a/src/Command/Locale/LanguageAddCommand.php b/src/Command/Locale/LanguageAddCommand.php index 4baf8ef9e..9ea8eb5dd 100644 --- a/src/Command/Locale/LanguageAddCommand.php +++ b/src/Command/Locale/LanguageAddCommand.php @@ -11,10 +11,9 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Drupal\language\Entity\ConfigurableLanguage; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Command\Shared\LocaleTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Console\Utils\Site; use Drupal\Console\Annotations\DrupalCommand; @@ -27,7 +26,6 @@ */ class LanguageAddCommand extends Command { - use CommandTrait; use LocaleTrait; /** diff --git a/src/Command/Locale/LanguageDeleteCommand.php b/src/Command/Locale/LanguageDeleteCommand.php index c6689bf12..2a27accbc 100644 --- a/src/Command/Locale/LanguageDeleteCommand.php +++ b/src/Command/Locale/LanguageDeleteCommand.php @@ -11,9 +11,8 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\LocaleTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Console\Utils\Site; @@ -27,7 +26,6 @@ */ class LanguageDeleteCommand extends Command { - use CommandTrait; use LocaleTrait; /** diff --git a/src/Command/Locale/TranslationStatusCommand.php b/src/Command/Locale/TranslationStatusCommand.php index 95ed676fd..4c8f0304b 100644 --- a/src/Command/Locale/TranslationStatusCommand.php +++ b/src/Command/Locale/TranslationStatusCommand.php @@ -10,10 +10,9 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Command\Shared\LocaleTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Utils\Site; use Drupal\Console\Extension\Manager; use Drupal\Console\Annotations\DrupalCommand; @@ -26,7 +25,6 @@ */ class TranslationStatusCommand extends Command { - use CommandTrait; use LocaleTrait; /** diff --git a/src/Command/Migrate/ExecuteCommand.php b/src/Command/Migrate/ExecuteCommand.php index ceb4083c3..06ad78724 100644 --- a/src/Command/Migrate/ExecuteCommand.php +++ b/src/Command/Migrate/ExecuteCommand.php @@ -16,11 +16,10 @@ use Drupal\Console\Utils\MigrateExecuteMessageCapture; use Drupal\Console\Command\Shared\MigrationTrait; use Drupal\Console\Command\Shared\DatabaseTrait; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\migrate\Plugin\MigrationInterface; use Drupal\State\StateInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\migrate\Plugin\MigrationPluginManagerInterface; use Drupal\Console\Annotations\DrupalCommand; @@ -34,7 +33,6 @@ class ExecuteCommand extends Command { use DatabaseTrait; use MigrationTrait; - use CommandTrait; protected $migrateConnection; diff --git a/src/Command/Migrate/RollBackCommand.php b/src/Command/Migrate/RollBackCommand.php index 84468e6d2..d8ae107ed 100644 --- a/src/Command/Migrate/RollBackCommand.php +++ b/src/Command/Migrate/RollBackCommand.php @@ -14,8 +14,7 @@ use Drupal\Console\Command\Shared\MigrationTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Annotations\DrupalCommand; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\migrate_plus\Entity\MigrationGroup; use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\MigrateExecutable; @@ -31,7 +30,6 @@ class RollBackCommand extends Command { use MigrationTrait; - use CommandTrait; /** * @var MigrationPluginManagerInterface $pluginManagerMigration diff --git a/src/Command/Migrate/SetupCommand.php b/src/Command/Migrate/SetupCommand.php index ae249249e..ecd16286d 100644 --- a/src/Command/Migrate/SetupCommand.php +++ b/src/Command/Migrate/SetupCommand.php @@ -12,8 +12,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Command\Shared\DatabaseTrait; use Drupal\Console\Command\Shared\MigrationTrait; use Drupal\migrate\Plugin\MigrationPluginManagerInterface; @@ -28,9 +27,8 @@ * extensionType = "module" * ) */ -class SetupCommand extends Command +class SetupCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; use DatabaseTrait; use MigrationTrait; diff --git a/src/Command/Module/DownloadCommand.php b/src/Command/Module/DownloadCommand.php index 8640f4027..56c8130c8 100644 --- a/src/Command/Module/DownloadCommand.php +++ b/src/Command/Module/DownloadCommand.php @@ -7,12 +7,11 @@ namespace Drupal\Console\Command\Module; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ProjectDownloadTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Utils\DrupalApi; @@ -25,7 +24,6 @@ class DownloadCommand extends Command { - use CommandTrait; use ProjectDownloadTrait; /** diff --git a/src/Command/Module/InstallCommand.php b/src/Command/Module/InstallCommand.php index 3d08bf13a..81a3c25b6 100644 --- a/src/Command/Module/InstallCommand.php +++ b/src/Command/Module/InstallCommand.php @@ -7,13 +7,12 @@ namespace Drupal\Console\Command\Module; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Process\ProcessBuilder; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ProjectDownloadTrait; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Core\Style\DrupalStyle; @@ -31,7 +30,6 @@ */ class InstallCommand extends Command { - use CommandTrait; use ProjectDownloadTrait; use ModuleTrait; diff --git a/src/Command/Module/InstallDependencyCommand.php b/src/Command/Module/InstallDependencyCommand.php index 884a2be7b..311b98475 100644 --- a/src/Command/Module/InstallDependencyCommand.php +++ b/src/Command/Module/InstallDependencyCommand.php @@ -7,12 +7,11 @@ namespace Drupal\Console\Command\Module; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ProjectDownloadTrait; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Core\Style\DrupalStyle; @@ -28,7 +27,6 @@ */ class InstallDependencyCommand extends Command { - use CommandTrait; use ProjectDownloadTrait; use ModuleTrait; diff --git a/src/Command/Module/PathCommand.php b/src/Command/Module/PathCommand.php index a32f6cf42..0d8cfa697 100644 --- a/src/Command/Module/PathCommand.php +++ b/src/Command/Module/PathCommand.php @@ -11,15 +11,13 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ModuleTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Extension\Manager; class PathCommand extends Command { - use CommandTrait; use ModuleTrait; /** diff --git a/src/Command/Module/UninstallCommand.php b/src/Command/Module/UninstallCommand.php index 114c1ee3d..603f00d76 100755 --- a/src/Command/Module/UninstallCommand.php +++ b/src/Command/Module/UninstallCommand.php @@ -7,13 +7,12 @@ namespace Drupal\Console\Command\Module; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Extension\Manager; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Command\Shared\ProjectDownloadTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Utils\Site; @@ -23,7 +22,6 @@ class UninstallCommand extends Command { - use CommandTrait; use ProjectDownloadTrait; /** diff --git a/src/Command/Module/UpdateCommand.php b/src/Command/Module/UpdateCommand.php index db251277c..511c100fe 100644 --- a/src/Command/Module/UpdateCommand.php +++ b/src/Command/Module/UpdateCommand.php @@ -7,19 +7,17 @@ namespace Drupal\Console\Command\Module; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Command\Shared\ProjectDownloadTrait; use Drupal\Console\Core\Utils\ShellProcess; class UpdateCommand extends Command { - use CommandTrait; use ProjectDownloadTrait; diff --git a/src/Command/Multisite/NewCommand.php b/src/Command/Multisite/NewCommand.php index 008bb09c2..8e8e1c3fc 100644 --- a/src/Command/Multisite/NewCommand.php +++ b/src/Command/Multisite/NewCommand.php @@ -7,9 +7,8 @@ namespace Drupal\Console\Command\Multisite; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -25,8 +24,6 @@ */ class NewCommand extends Command { - use CommandTrait; - protected $appRoot; /** diff --git a/src/Command/Node/AccessRebuildCommand.php b/src/Command/Node/AccessRebuildCommand.php index e8abf86a6..dabbb73b1 100644 --- a/src/Command/Node/AccessRebuildCommand.php +++ b/src/Command/Node/AccessRebuildCommand.php @@ -10,9 +10,8 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\State\StateInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -22,8 +21,6 @@ */ class AccessRebuildCommand extends Command { - use CommandTrait; - /** * @var StateInterface */ diff --git a/src/Command/Queue/RunCommand.php b/src/Command/Queue/RunCommand.php index 7fac3e05d..d45f4db75 100644 --- a/src/Command/Queue/RunCommand.php +++ b/src/Command/Queue/RunCommand.php @@ -7,13 +7,12 @@ namespace Drupal\Console\Command\Queue; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Drupal\Core\Queue\QueueWorkerManagerInterface; use Drupal\Core\Queue\QueueFactory; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -23,8 +22,6 @@ */ class RunCommand extends Command { - use CommandTrait; - /** * @var QueueWorkerManagerInterface */ diff --git a/src/Command/Rest/DisableCommand.php b/src/Command/Rest/DisableCommand.php index a2778574b..b42bdc8b6 100644 --- a/src/Command/Rest/DisableCommand.php +++ b/src/Command/Rest/DisableCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Annotations\DrupalCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Command\Shared\RestTrait; @@ -26,7 +25,6 @@ */ class DisableCommand extends Command { - use CommandTrait; use RestTrait; /** diff --git a/src/Command/Rest/EnableCommand.php b/src/Command/Rest/EnableCommand.php index 121c7903a..1a7c6c0ec 100644 --- a/src/Command/Rest/EnableCommand.php +++ b/src/Command/Rest/EnableCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Annotations\DrupalCommand; use Drupal\rest\RestResourceConfigInterface; use Drupal\Console\Core\Style\DrupalStyle; @@ -29,7 +28,6 @@ */ class EnableCommand extends Command { - use CommandTrait; use RestTrait; /** diff --git a/src/Command/Router/RebuildCommand.php b/src/Command/Router/RebuildCommand.php index e1b06ef73..7c5bc5bb8 100644 --- a/src/Command/Router/RebuildCommand.php +++ b/src/Command/Router/RebuildCommand.php @@ -9,15 +9,12 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Routing\RouteBuilderInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class RebuildCommand extends Command { - use CommandTrait; - /** * @var RouteBuilderInterface */ diff --git a/src/Command/ServerCommand.php b/src/Command/ServerCommand.php index e306ceeca..16e1c7fcc 100644 --- a/src/Command/ServerCommand.php +++ b/src/Command/ServerCommand.php @@ -12,8 +12,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Process\ProcessBuilder; use Symfony\Component\Process\PhpExecutableFinder; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use \Drupal\Console\Core\Utils\ConfigurationManager; @@ -24,8 +23,6 @@ */ class ServerCommand extends Command { - use CommandTrait; - /** * @var string */ diff --git a/src/Command/ShellCommand.php b/src/Command/ShellCommand.php index 1c9b20c45..7db66821f 100644 --- a/src/Command/ShellCommand.php +++ b/src/Command/ShellCommand.php @@ -6,8 +6,7 @@ use Psy\Configuration; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; /** * Class ShellCommand @@ -16,8 +15,6 @@ */ class ShellCommand extends Command { - use CommandTrait; - /** * {@inheritdoc} */ diff --git a/src/Command/Site/ImportLocalCommand.php b/src/Command/Site/ImportLocalCommand.php index 9b030cbed..ef2750f2b 100644 --- a/src/Command/Site/ImportLocalCommand.php +++ b/src/Command/Site/ImportLocalCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Core\Utils\ConfigurationManager; use Symfony\Component\Filesystem\Filesystem; @@ -25,8 +24,6 @@ */ class ImportLocalCommand extends Command { - use CommandTrait; - /** * @var string */ diff --git a/src/Command/Site/InstallCommand.php b/src/Command/Site/InstallCommand.php index 480219581..19f4dde6c 100644 --- a/src/Command/Site/InstallCommand.php +++ b/src/Command/Site/InstallCommand.php @@ -13,10 +13,9 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Core\Database\Database; use Drupal\Core\Installer\Exception\AlreadyInstalledException; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Command\Shared\DatabaseTrait; use Drupal\Console\Core\Utils\ConfigurationManager; use Drupal\Console\Extension\Manager; @@ -25,9 +24,8 @@ use Drupal\Console\Utils\Site; use Drupal\Console\Core\Utils\DrupalFinder; -class InstallCommand extends Command +class InstallCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; use DatabaseTrait; /** diff --git a/src/Command/Site/MaintenanceCommand.php b/src/Command/Site/MaintenanceCommand.php index 8614abc28..f3af9ecd0 100644 --- a/src/Command/Site/MaintenanceCommand.php +++ b/src/Command/Site/MaintenanceCommand.php @@ -10,17 +10,13 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Core\State\StateInterface; use Drupal\Console\Core\Utils\ChainQueue; -class MaintenanceCommand extends Command +class MaintenanceCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; - - /** * @var StateInterface */ diff --git a/src/Command/Site/ModeCommand.php b/src/Command/Site/ModeCommand.php index e9f2cbae3..3767e1727 100644 --- a/src/Command/Site/ModeCommand.php +++ b/src/Command/Site/ModeCommand.php @@ -11,17 +11,14 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Yaml\Yaml; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Core\Utils\ConfigurationManager; use Drupal\Core\Config\ConfigFactory; use Drupal\Console\Core\Utils\ChainQueue; -class ModeCommand extends Command +class ModeCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; - /** * @var ConfigFactory */ diff --git a/src/Command/Site/StatisticsCommand.php b/src/Command/Site/StatisticsCommand.php index 4a4a6aede..4d4fcfc62 100644 --- a/src/Command/Site/StatisticsCommand.php +++ b/src/Command/Site/StatisticsCommand.php @@ -9,8 +9,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Utils\DrupalApi; use Drupal\Core\Entity\Query\QueryFactory; @@ -22,10 +21,8 @@ * * @package Drupal\Console\Command\Site */ -class StatisticsCommand extends Command +class StatisticsCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; - /** * @var DrupalApi */ diff --git a/src/Command/Site/StatusCommand.php b/src/Command/Site/StatusCommand.php index e0ee9502b..9773b0ee2 100644 --- a/src/Command/Site/StatusCommand.php +++ b/src/Command/Site/StatusCommand.php @@ -10,9 +10,8 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\ContainerAwareCommand; use Drupal\Core\Database\Database; -use Drupal\Console\Core\Command\Shared\ContainerAwareCommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\system\SystemManager; use Drupal\Core\Site\Settings; @@ -24,10 +23,8 @@ * * @category site */ -class StatusCommand extends Command +class StatusCommand extends ContainerAwareCommand { - use ContainerAwareCommandTrait; - /* @var $connectionInfoKeys array */ protected $connectionInfoKeys = [ 'driver', diff --git a/src/Command/State/DeleteCommand.php b/src/Command/State/DeleteCommand.php index 5c3bf1596..0e30b5945 100644 --- a/src/Command/State/DeleteCommand.php +++ b/src/Command/State/DeleteCommand.php @@ -9,16 +9,13 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\KeyValueStore\KeyValueFactoryInterface; use Drupal\Core\State\StateInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; class DeleteCommand extends Command { - use CommandTrait; - /** * @var StateInterface */ diff --git a/src/Command/State/OverrideCommand.php b/src/Command/State/OverrideCommand.php index dc1f88d99..6032d4bf8 100644 --- a/src/Command/State/OverrideCommand.php +++ b/src/Command/State/OverrideCommand.php @@ -10,10 +10,9 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\KeyValueStore\KeyValueFactoryInterface; use Drupal\Core\State\StateInterface; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Component\Serialization\Yaml; @@ -24,8 +23,6 @@ */ class OverrideCommand extends Command { - use CommandTrait; - /** * @var StateInterface */ diff --git a/src/Command/Taxonomy/DeleteTermCommand.php b/src/Command/Taxonomy/DeleteTermCommand.php index 98832b488..3200b092a 100644 --- a/src/Command/Taxonomy/DeleteTermCommand.php +++ b/src/Command/Taxonomy/DeleteTermCommand.php @@ -4,12 +4,11 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Symfony\Component\Console\Input\InputArgument; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\taxonomy\Entity\Term; use Drupal\taxonomy\Entity\Vocabulary; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; /** @@ -19,8 +18,6 @@ */ class DeleteTermCommand extends Command { - use CommandTrait; - /** * The entity_type storage. * diff --git a/src/Command/Test/RunCommand.php b/src/Command/Test/RunCommand.php index 492bb1e30..74f3d06a7 100644 --- a/src/Command/Test/RunCommand.php +++ b/src/Command/Test/RunCommand.php @@ -12,8 +12,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Drupal\Component\Utility\Timer; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Annotations\DrupalCommand; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Core\Extension\ModuleHandlerInterface; @@ -28,8 +27,6 @@ */ class RunCommand extends Command { - use CommandTrait; - /** * @var string */ diff --git a/src/Command/Theme/DownloadCommand.php b/src/Command/Theme/DownloadCommand.php index 0f01f2c37..3db6105dd 100644 --- a/src/Command/Theme/DownloadCommand.php +++ b/src/Command/Theme/DownloadCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Command\Shared\ProjectDownloadTrait; use Drupal\Console\Utils\DrupalApi; @@ -21,8 +20,6 @@ class DownloadCommand extends Command { use ProjectDownloadTrait; - use CommandTrait; - /** * @var DrupalApi diff --git a/src/Command/Theme/InstallCommand.php b/src/Command/Theme/InstallCommand.php index 77ce74796..ea5eb4aa9 100644 --- a/src/Command/Theme/InstallCommand.php +++ b/src/Command/Theme/InstallCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Config\ConfigFactory; use Drupal\Core\Extension\ThemeHandler; use Drupal\Core\Config\UnmetDependenciesException; @@ -21,8 +20,6 @@ class InstallCommand extends Command { - use CommandTrait; - /** * @var ConfigFactory */ diff --git a/src/Command/Theme/PathCommand.php b/src/Command/Theme/PathCommand.php index fdfd85dce..77bd52693 100644 --- a/src/Command/Theme/PathCommand.php +++ b/src/Command/Theme/PathCommand.php @@ -11,17 +11,13 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Extension\Manager; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Core\Extension\ThemeHandler; class PathCommand extends Command { - use CommandTrait; - - /** * @var Manager */ diff --git a/src/Command/Theme/UninstallCommand.php b/src/Command/Theme/UninstallCommand.php index f553b6df2..7f0ae1005 100644 --- a/src/Command/Theme/UninstallCommand.php +++ b/src/Command/Theme/UninstallCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Config\ConfigFactory; use Drupal\Core\Extension\ThemeHandler; use Drupal\Core\Config\UnmetDependenciesException; @@ -20,8 +19,6 @@ class UninstallCommand extends Command { - use CommandTrait; - /** * @var ConfigFactory */ diff --git a/src/Command/Update/EntitiesCommand.php b/src/Command/Update/EntitiesCommand.php index bf28b81f0..c1f98eaf5 100644 --- a/src/Command/Update/EntitiesCommand.php +++ b/src/Command/Update/EntitiesCommand.php @@ -9,8 +9,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityStorageException; use Drupal\Core\Utility\Error; use Drupal\Console\Core\Style\DrupalStyle; @@ -25,8 +24,6 @@ */ class EntitiesCommand extends Command { - use CommandTrait; - /** * @var StateInterface */ diff --git a/src/Command/Update/ExecuteCommand.php b/src/Command/Update/ExecuteCommand.php index 82d102f37..3eec5774a 100644 --- a/src/Command/Update/ExecuteCommand.php +++ b/src/Command/Update/ExecuteCommand.php @@ -10,11 +10,10 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; +use Drupal\Console\Core\Command\Command; use Drupal\Core\State\StateInterface; use Drupal\Core\Extension\ModuleHandler; use Drupal\Core\Update\UpdateRegistry; -use Drupal\Console\Core\Command\Shared\CommandTrait; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\Console\Utils\Site; use Drupal\Console\Extension\Manager; @@ -22,8 +21,6 @@ class ExecuteCommand extends Command { - use CommandTrait; - /** * @var Site */ diff --git a/src/Command/User/CreateCommand.php b/src/Command/User/CreateCommand.php index d1bd21d0d..dffd2d163 100644 --- a/src/Command/User/CreateCommand.php +++ b/src/Command/User/CreateCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Database\Connection; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Datetime\DateFormatterInterface; @@ -23,7 +22,6 @@ class CreateCommand extends Command { - use CommandTrait; use ConfirmationTrait; /** diff --git a/src/Command/User/DeleteCommand.php b/src/Command/User/DeleteCommand.php index 0992e0d90..db20543d8 100644 --- a/src/Command/User/DeleteCommand.php +++ b/src/Command/User/DeleteCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\Query\QueryFactory; use Drupal\Console\Core\Style\DrupalStyle; @@ -24,8 +23,6 @@ */ class DeleteCommand extends Command { - use CommandTrait; - /** * @var EntityTypeManagerInterface */ diff --git a/src/Command/User/LoginCleanAttemptsCommand.php b/src/Command/User/LoginCleanAttemptsCommand.php index 434282321..3bb1232b0 100644 --- a/src/Command/User/LoginCleanAttemptsCommand.php +++ b/src/Command/User/LoginCleanAttemptsCommand.php @@ -11,15 +11,13 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Output\OutputInterface; use Drupal\Console\Command\Shared\ConfirmationTrait; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Database\Connection; use Drupal\Console\Core\Style\DrupalStyle; use Drupal\user\Entity\User; class LoginCleanAttemptsCommand extends Command { - use CommandTrait; use ConfirmationTrait; /** diff --git a/src/Command/User/LoginUrlCommand.php b/src/Command/User/LoginUrlCommand.php index 97d4e08fb..6cd60cf86 100644 --- a/src/Command/User/LoginUrlCommand.php +++ b/src/Command/User/LoginUrlCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Console\Core\Style\DrupalStyle; @@ -22,8 +21,6 @@ */ class LoginUrlCommand extends Command { - use CommandTrait; - /** * @var EntityTypeManagerInterface */ diff --git a/src/Command/User/PasswordHashCommand.php b/src/Command/User/PasswordHashCommand.php index bc9e62490..53f5843d5 100644 --- a/src/Command/User/PasswordHashCommand.php +++ b/src/Command/User/PasswordHashCommand.php @@ -10,15 +10,13 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Password\PasswordInterface; use Drupal\Console\Command\Shared\ConfirmationTrait; use Drupal\Console\Core\Style\DrupalStyle; class PasswordHashCommand extends Command { - use CommandTrait; use ConfirmationTrait; /** diff --git a/src/Command/User/PasswordResetCommand.php b/src/Command/User/PasswordResetCommand.php index 2eab398d5..67bc26457 100644 --- a/src/Command/User/PasswordResetCommand.php +++ b/src/Command/User/PasswordResetCommand.php @@ -9,8 +9,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Database\Connection; use Drupal\Console\Core\Utils\ChainQueue; use Drupal\Console\Command\Shared\ConfirmationTrait; @@ -19,7 +18,6 @@ class PasswordResetCommand extends Command { - use CommandTrait; use ConfirmationTrait; /** diff --git a/src/Command/User/RoleCommand.php b/src/Command/User/RoleCommand.php index dbce8e411..3dd34b09c 100644 --- a/src/Command/User/RoleCommand.php +++ b/src/Command/User/RoleCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Console\Utils\DrupalApi; use Drupal\Console\Core\Style\DrupalStyle; @@ -22,8 +21,6 @@ */ class RoleCommand extends Command { - use CommandTrait; - /** * @var DrupalApi */ diff --git a/src/Command/Views/DisableCommand.php b/src/Command/Views/DisableCommand.php index 4a0dddcb1..98cf7cf37 100644 --- a/src/Command/Views/DisableCommand.php +++ b/src/Command/Views/DisableCommand.php @@ -10,8 +10,7 @@ use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\Query\QueryFactory; use Drupal\Console\Core\Style\DrupalStyle; @@ -23,8 +22,6 @@ */ class DisableCommand extends Command { - use CommandTrait; - /** * @var EntityTypeManagerInterface */ diff --git a/src/Command/Views/EnableCommand.php b/src/Command/Views/EnableCommand.php index 7e3a56aa0..9ecd03c17 100644 --- a/src/Command/Views/EnableCommand.php +++ b/src/Command/Views/EnableCommand.php @@ -11,8 +11,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Config\Definition\Exception\Exception; -use Symfony\Component\Console\Command\Command; -use Drupal\Console\Core\Command\Shared\CommandTrait; +use Drupal\Console\Core\Command\Command; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Entity\Query\QueryFactory; use Drupal\Console\Core\Style\DrupalStyle; @@ -24,8 +23,6 @@ */ class EnableCommand extends Command { - use CommandTrait; - /** * @var EntityTypeManagerInterface */