From 92850ec11832b4f2bce3369ea2108d9e9bb4e15b Mon Sep 17 00:00:00 2001 From: Jesus Manuel Olivas Date: Fri, 26 May 2017 01:47:18 -0700 Subject: [PATCH] [console] Tag 1.0.0-rc20 release. --- composer.json | 2 +- composer.lock | 26 +++++++++++++------------- src/Application.php | 12 +++++------- src/Command/Generate/ThemeCommand.php | 4 ++-- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/composer.json b/composer.json index 4629b40df..10fbb4693 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ }, "require": { "php": "^5.5.9 || ^7.0", - "drupal/console-core" : "1.0.0-rc19", + "drupal/console-core" : "1.0.0-rc20", "drupal/console-extend-plugin": "~0", "alchemy/zippy": "0.4.3", "doctrine/collections":"~1.3", diff --git a/composer.lock b/composer.lock index dae62adb0..407722d21 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": "84fad6a02d63cf1ce4d8a128b65c610a", + "content-hash": "1718b3e16b129d9d4ef34551230d2d1e", "packages": [ { "name": "alchemy/zippy", @@ -571,21 +571,21 @@ }, { "name": "drupal/console-core", - "version": "1.0.0-rc19", + "version": "1.0.0-rc20", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-core.git", - "reference": "c5be69f660727b38ce6c904dcb0e061e03de7aeb" + "reference": "4b93841301a88db2ae210186e74e0e2529369c17" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/c5be69f660727b38ce6c904dcb0e061e03de7aeb", - "reference": "c5be69f660727b38ce6c904dcb0e061e03de7aeb", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-core/zipball/4b93841301a88db2ae210186e74e0e2529369c17", + "reference": "4b93841301a88db2ae210186e74e0e2529369c17", "shasum": "" }, "require": { "dflydev/dot-access-configuration": "1.0.1", - "drupal/console-en": "1.0.0-rc19", + "drupal/console-en": "1.0.0-rc20", "php": "^5.5.9 || ^7.0", "stecman/symfony-console-completion": "~0.7", "symfony/config": ">=2.7 <3.0", @@ -599,7 +599,7 @@ "symfony/translation": ">=2.7 <3.0", "symfony/yaml": ">=2.7 <3.0", "twig/twig": "^1.23.1", - "webflo/drupal-finder": "0.*" + "webflo/drupal-finder": "^0.3.0" }, "type": "project", "autoload": { @@ -647,20 +647,20 @@ "drupal", "symfony" ], - "time": "2017-05-08T16:08:29+00:00" + "time": "2017-05-26T08:40:17+00:00" }, { "name": "drupal/console-en", - "version": "1.0.0-rc19", + "version": "1.0.0-rc20", "source": { "type": "git", "url": "https://github.com/hechoendrupal/drupal-console-en.git", - "reference": "df4da4011500496fc9c1d611cd36343006079915" + "reference": "b6f563b8760c3b19aad22dd213a9cfba2f2c75d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/df4da4011500496fc9c1d611cd36343006079915", - "reference": "df4da4011500496fc9c1d611cd36343006079915", + "url": "https://api.github.com/repos/hechoendrupal/drupal-console-en/zipball/b6f563b8760c3b19aad22dd213a9cfba2f2c75d0", + "reference": "b6f563b8760c3b19aad22dd213a9cfba2f2c75d0", "shasum": "" }, "type": "drupal-console-language", @@ -701,7 +701,7 @@ "drupal", "symfony" ], - "time": "2017-05-05T21:51:49+00:00" + "time": "2017-05-20T23:29:05+00:00" }, { "name": "drupal/console-extend-plugin", diff --git a/src/Application.php b/src/Application.php index 735f27653..4cc228460 100644 --- a/src/Application.php +++ b/src/Application.php @@ -25,7 +25,7 @@ class Application extends BaseApplication /** * @var string */ - const VERSION = '1.0.0-rc19'; + const VERSION = '1.0.0-rc20'; public function __construct(ContainerInterface $container) { @@ -44,13 +44,11 @@ public function getLongVersion() if ('UNKNOWN' !== $this->getName()) { if ('UNKNOWN' !== $this->getVersion()) { $output .= sprintf('%s version %s', $this->getName(), $this->getVersion()); + } else { + $output .= sprintf('%s', $this->getName()); } - else { - $output .= sprintf('%s', $this->getName()); - } - } - else { - $output .= 'Console Tool'; + } else { + $output .= 'Console Tool'; } return $output; diff --git a/src/Command/Generate/ThemeCommand.php b/src/Command/Generate/ThemeCommand.php index fc014a7c2..4ec9a7509 100644 --- a/src/Command/Generate/ThemeCommand.php +++ b/src/Command/Generate/ThemeCommand.php @@ -147,7 +147,7 @@ protected function configure() InputOption::VALUE_OPTIONAL, $this->trans('commands.generate.theme.options.global-library') ) - ->addOption( + ->addOption( 'libraries', null, InputOption::VALUE_OPTIONAL, @@ -195,7 +195,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $package = $input->getOption('package'); $base_theme = $input->getOption('base-theme'); $global_library = $input->getOption('global-library'); - $libraries = $input->getOption('libraries'); + $libraries = $input->getOption('libraries'); $regions = $input->getOption('regions'); $breakpoints = $input->getOption('breakpoints');