From f6c245d80dc92321c2e79c12609c7da6e09a88a5 Mon Sep 17 00:00:00 2001 From: Jesus Manuel Olivas Date: Wed, 28 Dec 2016 00:20:20 -0800 Subject: [PATCH] [console] Update namespace. --- composer.json | 4 +- composer.lock | 25 +++++----- config.yml | 6 +-- config/dist/chain/quick-start.yml | 2 +- services.yml | 48 +++++++++---------- ...ConsoleApplication.php => Application.php} | 30 ++++++------ src/Bootstrap/DrupalConsoleCore.php | 2 +- src/Command/AboutCommand.php | 8 ++-- src/Command/Chain/ChainCommand.php | 16 +++---- src/Command/Chain/ChainCustomCommand.php | 10 ++-- src/Command/Chain/ChainDebugCommand.php | 12 ++--- src/Command/CheckCommand.php | 16 +++---- src/Command/CompleteCommand.php | 6 +-- src/Command/Exclude/DrupliconCommand.php | 10 ++-- src/Command/Exclude/DrushCommand.php | 12 ++--- src/Command/Exclude/ElephpantCommand.php | 10 ++-- src/Command/Exec/ExecCommand.php | 12 ++--- src/Command/HelpCommand.php | 10 ++-- src/Command/InitCommand.php | 16 +++---- src/Command/ListCommand.php | 10 ++-- src/Command/Settings/DebugCommand.php | 14 +++--- src/Command/Settings/SetCommand.php | 14 +++--- src/Command/Shared/CommandTrait.php | 8 ++-- .../Shared/ContainerAwareCommandTrait.php | 6 +-- src/Command/Shared/InputTrait.php | 6 +-- src/Command/Site/DebugCommand.php | 12 ++--- src/Descriptor/TextDescriptor.php | 2 +- src/EventSubscriber/CallCommandListener.php | 8 ++-- .../DefaultValueEventListener.php | 6 +-- .../ShowGenerateChainListener.php | 10 ++-- .../ShowGenerateInlineListener.php | 8 ++-- .../ShowGeneratedFilesListener.php | 10 ++-- src/EventSubscriber/ShowTipsListener.php | 10 ++-- .../ShowWelcomeMessageListener.php | 10 ++-- .../ValidateExecutionListener.php | 10 ++-- src/Generator/Generator.php | 8 ++-- src/Generator/InitGenerator.php | 6 +-- src/Helper/DescriptorHelper.php | 4 +- src/Helper/DrupalChoiceQuestionHelper.php | 2 +- src/Style/DrupalStyle.php | 4 +- src/Utils/ArgvInputReader.php | 2 +- src/Utils/ChainDiscovery.php | 4 +- src/Utils/ChainQueue.php | 6 +-- src/Utils/ConfigurationManager.php | 2 +- src/Utils/FileQueue.php | 6 +-- src/Utils/NestedArray.php | 4 +- src/Utils/RequirementChecker.php | 4 +- src/Utils/ShellProcess.php | 6 +-- src/Utils/ShowFile.php | 8 ++-- src/Utils/StringConverter.php | 4 +- src/Utils/TranslatorManager.php | 6 +-- src/Utils/TwigRenderer.php | 6 +-- 52 files changed, 241 insertions(+), 240 deletions(-) rename src/{ConsoleApplication.php => Application.php} (92%) diff --git a/composer.json b/composer.json index de445ad..ff97490 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ }, "require": { "php": "^5.5.9 || ^7.0", - "drupal/console-en" : "1.0.0-rc12", + "drupal/console-en" : "self.version", "dflydev/dot-access-configuration": "dev-master", "stecman/symfony-console-completion": "~0.7", "symfony/console": ">=2.7 <3.2", @@ -60,6 +60,6 @@ "src/constants.php", "src/functions.php" ], - "psr-4": {"Drupal\\Console\\": "src"} + "psr-4": {"Drupal\\Console\\Core\\": "src"} } } diff --git a/composer.lock b/composer.lock index cc34a2e..5c9c5c3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "cefa17da2a2d2e053b8b7df300e0b4be", + "content-hash": "82b8f75e86a57c5714bdb44431bd876a", "packages": [ { "name": "dflydev/dot-access-configuration", @@ -174,16 +174,16 @@ }, { "name": "drupal/console-en", - "version": "1.0.0-rc12", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-en.git", - "reference": "810cc4d3e45d47ff444be57c8d25f50ebfcfae28" + "reference": "815bd92f8984bb3a8ad8fceabdba60b1a50fe345" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/810cc4d3e45d47ff444be57c8d25f50ebfcfae28", - "reference": "810cc4d3e45d47ff444be57c8d25f50ebfcfae28", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/815bd92f8984bb3a8ad8fceabdba60b1a50fe345", + "reference": "815bd92f8984bb3a8ad8fceabdba60b1a50fe345", "shasum": "" }, "type": "drupal-console-language", @@ -224,7 +224,7 @@ "drupal", "symfony" ], - "time": "2016-12-22T16:11:31+00:00" + "time": "2016-12-27 01:51:22" }, { "name": "psr/log", @@ -933,16 +933,16 @@ }, { "name": "twig/twig", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "74f723e542368ca2080b252740be5f1113ebb898" + "reference": "c6ff71094fde15d12398eaba029434b013dc5e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/74f723e542368ca2080b252740be5f1113ebb898", - "reference": "74f723e542368ca2080b252740be5f1113ebb898", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/c6ff71094fde15d12398eaba029434b013dc5e59", + "reference": "c6ff71094fde15d12398eaba029434b013dc5e59", "shasum": "" }, "require": { @@ -955,7 +955,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.29-dev" + "dev-master": "1.30-dev" } }, "autoload": { @@ -990,7 +990,7 @@ "keywords": [ "templating" ], - "time": "2016-12-13T17:28:18+00:00" + "time": "2016-12-23T11:06:22+00:00" }, { "name": "webflo/drupal-finder", @@ -1034,6 +1034,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "drupal/console-en": 20, "dflydev/dot-access-configuration": 20 }, "prefer-stable": true, diff --git a/config.yml b/config.yml index 899d578..145a436 100644 --- a/config.yml +++ b/config.yml @@ -7,13 +7,13 @@ application: class: '\Stecman\Component\Symfony\Console\BashCompletion\CompletionCommand' name: drush: - class: '\Drupal\Console\Command\Exclude\DrushCommand' + class: '\Drupal\Console\Core\Command\Exclude\DrushCommand' arguments: ['@console.configuration_manager', '@console.chain_queue'] elephpant: - class: '\Drupal\Console\Command\Exclude\ElephpantCommand' + class: '\Drupal\Console\Core\Command\Exclude\ElephpantCommand' arguments: ['@app.root', '@console.renderer'] druplicon: - class: '\Drupal\Console\Command\Exclude\DrupliconCommand' + class: '\Drupal\Console\Core\Command\Exclude\DrupliconCommand' arguments: ['@app.root', '@console.renderer'] languages: en: 'English' diff --git a/config/dist/chain/quick-start.yml b/config/dist/chain/quick-start.yml index dc81acc..977d916 100644 --- a/config/dist/chain/quick-start.yml +++ b/config/dist/chain/quick-start.yml @@ -1,5 +1,5 @@ # How to use -# quick:start --placeholder="directory:/path/to/drupal-project/" --placeholder="repository:acquia/lightning-project" --placeholder="profile:minimal" +# quick:start --placeholder="directory:/path/to/drupal-project/" --placeholder="repository:acquia/lightning-project:^8.1" --placeholder="profile:minimal" command: name: quick:start description: 'Download, install and serve a new Drupal project' diff --git a/services.yml b/services.yml index ebcfed2..640135e 100644 --- a/services.yml +++ b/services.yml @@ -1,90 +1,90 @@ services: # DrupalConsoleCore Services console.translator_manager: - class: Drupal\Console\Utils\TranslatorManager + class: Drupal\Console\Core\Utils\TranslatorManager console.configuration_manager: - class: Drupal\Console\Utils\ConfigurationManager + class: Drupal\Console\Core\Utils\ConfigurationManager console.requirement_checker: - class: Drupal\Console\Utils\RequirementChecker + class: Drupal\Console\Core\Utils\RequirementChecker console.chain_queue: - class: Drupal\Console\Utils\ChainQueue + class: Drupal\Console\Core\Utils\ChainQueue console.nested_array: - class: Drupal\Console\Utils\NestedArray + class: Drupal\Console\Core\Utils\NestedArray console.show_file: - class: Drupal\Console\Utils\ShowFile + class: Drupal\Console\Core\Utils\ShowFile arguments: ['@app.root', '@console.translator_manager'] console.renderer: - class: Drupal\Console\Utils\TwigRenderer + class: Drupal\Console\Core\Utils\TwigRenderer arguments: ['@console.translator_manager', '@console.string_converter'] console.file_queue: - class: Drupal\Console\Utils\FileQueue + class: Drupal\Console\Core\Utils\FileQueue console.shell_process: - class: Drupal\Console\Utils\ShellProcess + class: Drupal\Console\Core\Utils\ShellProcess arguments: ['@app.root'] console.string_converter: - class: Drupal\Console\Utils\StringConverter + class: Drupal\Console\Core\Utils\StringConverter console.chain_discovery: - class: Drupal\Console\Utils\ChainDiscovery + class: Drupal\Console\Core\Utils\ChainDiscovery arguments: ['@console.root', '@console.configuration_manager'] # DrupalConsoleCore Commands console.about: - class: Drupal\Console\Command\AboutCommand + class: Drupal\Console\Core\Command\AboutCommand tags: - { name: drupal.command } console.list: - class: Drupal\Console\Command\ListCommand + class: Drupal\Console\Core\Command\ListCommand tags: - { name: drupal.command } console.help: - class: Drupal\Console\Command\HelpCommand + class: Drupal\Console\Core\Command\HelpCommand tags: - { name: drupal.command } console.complete: - class: Drupal\Console\Command\CompleteCommand + class: Drupal\Console\Core\Command\CompleteCommand tags: - { name: drupal.command } console.check: - class: Drupal\Console\Command\CheckCommand + class: Drupal\Console\Core\Command\CheckCommand arguments: ['@console.requirement_checker', '@console.chain_queue', '@console.configuration_manager'] tags: - { name: drupal.command } console.init: - class: Drupal\Console\Command\InitCommand + class: Drupal\Console\Core\Command\InitCommand arguments: ['@console.show_file', '@console.configuration_manager', '@console.init_generator', '@app.root', '@?console.root'] tags: - { name: drupal.command } console.settings_debug: - class: Drupal\Console\Command\Settings\DebugCommand + class: Drupal\Console\Core\Command\Settings\DebugCommand arguments: ['@console.configuration_manager', '@console.nested_array'] tags: - { name: drupal.command } console.settings_set: - class: Drupal\Console\Command\Settings\SetCommand + class: Drupal\Console\Core\Command\Settings\SetCommand arguments: ['@console.configuration_manager', '@console.nested_array'] tags: - { name: drupal.command } console.exec: - class: Drupal\Console\Command\Exec\ExecCommand + class: Drupal\Console\Core\Command\Exec\ExecCommand arguments: ['@console.shell_process'] tags: - { name: drupal.command } console.chain: - class: Drupal\Console\Command\Chain\ChainCommand + class: Drupal\Console\Core\Command\Chain\ChainCommand arguments: ['@console.chain_queue', '@console.chain_discovery'] tags: - { name: drupal.command } console.chain_debug: - class: Drupal\Console\Command\Chain\ChainDebugCommand + class: Drupal\Console\Core\Command\Chain\ChainDebugCommand arguments: ['@console.chain_discovery'] tags: - { name: drupal.command } console.site_debug: - class: Drupal\Console\Command\Site\DebugCommand + class: Drupal\Console\Core\Command\Site\DebugCommand arguments: ['@console.configuration_manager'] tags: - { name: drupal.command } # DrupalConsoleCore Generators console.init_generator: - class: Drupal\Console\Generator\InitGenerator + class: Drupal\Console\Core\Generator\InitGenerator tags: - { name: drupal.generator } diff --git a/src/ConsoleApplication.php b/src/Application.php similarity index 92% rename from src/ConsoleApplication.php rename to src/Application.php index 7568a66..3051ae4 100644 --- a/src/ConsoleApplication.php +++ b/src/Application.php @@ -1,31 +1,31 @@