Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[console] Update namespace. #119

Merged
merged 1 commit into from
Dec 28, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -60,6 +60,6 @@
"src/constants.php",
"src/functions.php"
],
"psr-4": {"Drupal\\Console\\": "src"}
"psr-4": {"Drupal\\Console\\Core\\": "src"}
}
}
25 changes: 13 additions & 12 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion config/dist/chain/quick-start.yml
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
48 changes: 24 additions & 24 deletions services.yml
Original file line number Diff line number Diff line change
@@ -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 }
30 changes: 15 additions & 15 deletions src/ConsoleApplication.php → src/Application.php
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
<?php

namespace Drupal\Console;
namespace Drupal\Console\Core;

use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Application;
use Drupal\Console\EventSubscriber\DefaultValueEventListener;
use Drupal\Console\EventSubscriber\ShowGenerateChainListener;
use Drupal\Console\EventSubscriber\ShowTipsListener;
use Drupal\Console\EventSubscriber\ShowWelcomeMessageListener;
use Drupal\Console\EventSubscriber\ValidateExecutionListener;
use Drupal\Console\EventSubscriber\ShowGeneratedFilesListener;
use Drupal\Console\EventSubscriber\ShowGenerateInlineListener;
use Drupal\Console\EventSubscriber\CallCommandListener;
use Drupal\Console\Utils\ConfigurationManager;
use Drupal\Console\Style\DrupalStyle;
use Drupal\Console\Utils\ChainDiscovery;
use Drupal\Console\Command\Chain\ChainCustomCommand;
use Symfony\Component\Console\Application as BaseApplication;
use Drupal\Console\Core\EventSubscriber\DefaultValueEventListener;
use Drupal\Console\Core\EventSubscriber\ShowGenerateChainListener;
use Drupal\Console\Core\EventSubscriber\ShowTipsListener;
use Drupal\Console\Core\EventSubscriber\ShowWelcomeMessageListener;
use Drupal\Console\Core\EventSubscriber\ValidateExecutionListener;
use Drupal\Console\Core\EventSubscriber\ShowGeneratedFilesListener;
use Drupal\Console\Core\EventSubscriber\ShowGenerateInlineListener;
use Drupal\Console\Core\EventSubscriber\CallCommandListener;
use Drupal\Console\Core\Utils\ConfigurationManager;
use Drupal\Console\Core\Style\DrupalStyle;
use Drupal\Console\Core\Utils\ChainDiscovery;
use Drupal\Console\Core\Command\Chain\ChainCustomCommand;

/**
* Class Application
* @package Drupal\Console
*/
class ConsoleApplication extends Application
class Application extends BaseApplication
{
/**
* @var ContainerInterface
Expand Down
2 changes: 1 addition & 1 deletion src/Bootstrap/DrupalConsoleCore.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Drupal\Console\Bootstrap;
namespace Drupal\Console\Core\Bootstrap;

use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Config\FileLocator;
Expand Down
8 changes: 4 additions & 4 deletions src/Command/AboutCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

/**
* @file
* Contains \Drupal\Console\Command\AboutCommand.
* Contains \Drupal\Console\Core\Command\AboutCommand.
*/

namespace Drupal\Console\Command;
namespace Drupal\Console\Core\Command;

use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Command\Command;
use Drupal\Console\Command\Shared\CommandTrait;
use Drupal\Console\Style\DrupalStyle;
use Drupal\Console\Core\Command\Shared\CommandTrait;
use Drupal\Console\Core\Style\DrupalStyle;

class AboutCommand extends Command
{
Expand Down
16 changes: 8 additions & 8 deletions src/Command/Chain/ChainCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

/**
* @file
* Contains \Drupal\Console\Command\Chain\ChainCommand.
* Contains \Drupal\Console\Core\Command\Chain\ChainCommand.
*/

namespace Drupal\Console\Command\Chain;
namespace Drupal\Console\Core\Command\Chain;

use Dflydev\PlaceholderResolver\DataSource\ArrayDataSource;
use Dflydev\PlaceholderResolver\RegexPlaceholderResolver;
Expand All @@ -15,15 +15,15 @@
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\Yaml\Parser;
use Drupal\Console\Utils\ChainQueue;
use Drupal\Console\Utils\ChainDiscovery;
use Drupal\Console\Command\Shared\InputTrait;
use Drupal\Console\Style\DrupalStyle;
use Drupal\Console\Command\Shared\CommandTrait;
use Drupal\Console\Core\Utils\ChainQueue;
use Drupal\Console\Core\Utils\ChainDiscovery;
use Drupal\Console\Core\Command\Shared\InputTrait;
use Drupal\Console\Core\Style\DrupalStyle;
use Drupal\Console\Core\Command\Shared\CommandTrait;

/**
* Class ChainCommand
* @package Drupal\Console\Command\Chain
* @package Drupal\Console\Core\Command\Chain
*/
class ChainCommand extends Command
{
Expand Down
10 changes: 5 additions & 5 deletions src/Command/Chain/ChainCustomCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@

/**
* @file
* Contains Drupal\Console\Command\ChainCustomCommand.
* Contains Drupal\Console\Core\Command\ChainCustomCommand.
*/

namespace Drupal\Console\Command\Chain;
namespace Drupal\Console\Core\Command\Chain;

use Symfony\Component\Console\Input\ArrayInput;
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\Command\Shared\CommandTrait;
use Drupal\Console\Command\Shared\InputTrait;
use Drupal\Console\Core\Command\Shared\CommandTrait;
use Drupal\Console\Core\Command\Shared\InputTrait;

/**
* Class ChainCustomCommand
*
* @package Drupal\Console\Command\ChainRegister
* @package Drupal\Console\Core\Command\ChainRegister
*/
class ChainCustomCommand extends Command
{
Expand Down
Loading