Merge remote-tracking branch 'upstream/master'

.gitignore

@@ -35,3 +35,6 @@ autoload.local.php
 # drupal/console-extend-plugin generated files
 extend.console.*.yml
 *-console.services.yml
+
+#PhpStorm
+.idea/*

bin/drupal.bat

@@ -0,0 +1,2 @@
+@echo off
+php "%~dp0/drupal.php" %*

bin/drupal.php

@@ -56,15 +56,16 @@
 chdir($drupalFinder->getDrupalRoot());
 $configurationManager = new ConfigurationManager();
 $configuration = $configurationManager
-    ->loadConfigurationFromDirectory($drupalFinder->getComposerRoot());
+    ->loadConfiguration($drupalFinder->getComposerRoot())
+    ->getConfiguration();
 
 $debug = $argvInputReader->get('debug', false);
 if ($configuration && $options = $configuration->get('application.options') ?: []) {
     $argvInputReader->setOptionsFromConfiguration($options);
 }
 $argvInputReader->setOptionsAsArgv();
 
-if ($debug){
+if ($debug) {
     $io->writeln(
         sprintf(
             '<info>%s</info> version <comment>%s</comment>',
@@ -74,7 +75,7 @@
     );
 }
 
-$drupal = new Drupal($autoload, $drupalFinder);
+$drupal = new Drupal($autoload, $drupalFinder, $configurationManager);
 $container = $drupal->boot();
 
 if (!$container) {
@@ -84,4 +85,5 @@
 }
 
 $application = new Application($container);
+$application->setDrupal($drupal);
 $application->run();

composer.json

@@ -4,7 +4,7 @@
     "keywords": ["Drupal", "Console", "Development", "Symfony"],
     "homepage": "http://drupalconsole.com/",
     "type": "library",
-    "license": "GPL-2.0+",
+    "license": "GPL-2.0-or-later",
     "authors": [
         {
             "name":      "David Flores",
@@ -27,11 +27,11 @@
         },
         {
             "name":      "Drupal Console Contributors",
-            "homepage":  "https://github.com/hechoendrupal/DrupalConsole/graphs/contributors"
+            "homepage":  "https://github.com/hechoendrupal/drupal-console/graphs/contributors"
         }
     ],
     "support": {
-        "issues": "https://github.com/hechoendrupal/DrupalConsole/issues",
+        "issues": "https://github.com/hechoendrupal/drupal-console/issues",
         "forum": "https://gitter.im/hechoendrupal/DrupalConsole",
         "docs": "https://docs.drupalconsole.com/"
     },
@@ -41,17 +41,18 @@
         "composer/installers": "~1.0",
         "doctrine/annotations": "^1.2",
         "doctrine/collections": "^1.3",
-        "drupal/console-core": "1.0.2",
-        "drupal/console-dotenv": "~0",
+        "drupal/console-core": "1.8.0",
         "drupal/console-extend-plugin": "~0",
-        "gabordemooij/redbean": "~4.3",
         "guzzlehttp/guzzle": "~6.1",
         "psy/psysh": "0.6.* || ~0.8",
         "symfony/css-selector": "~2.8|~3.0",
         "symfony/dom-crawler": "~2.8|~3.0",
-        "symfony/expression-language": "~2.8|~3.0",
         "symfony/http-foundation": "~2.8|~3.0"
     },
+    "suggest": {
+        "symfony/thanks": "Thank your favorite PHP projects on Github using the CLI!",
+        "vlucas/phpdotenv": "Loads environment variables from .env to getenv(), $_ENV and $_SERVER automagically."
+    },
     "bin": ["bin/drupal"],
     "config": {
         "bin-dir": "bin/",

config/services/config.yml

@@ -21,17 +21,17 @@ services:
       - { name: drupal.command }
   console.config_export_content_type:
     class: Drupal\Console\Command\Config\ExportContentTypeCommand
-    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager']
+    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager', '@console.validator']
     tags:
       - { name: drupal.command }
   console.config_export_single:
     class: Drupal\Console\Command\Config\ExportSingleCommand
-    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager']
+    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager','@language_manager', '@console.validator']
     tags:
       - { name: drupal.command }
   console.config_export_view:
     class: Drupal\Console\Command\Config\ExportViewCommand
-    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager']
+    arguments: ['@entity_type.manager', '@config.storage', '@console.extension_manager', '@console.validator']
     tags:
       - { name: drupal.command }
   console.config_import:

config/services/create.yml

@@ -24,3 +24,8 @@ services:
     arguments: ['@console.create_vocabulary_data']
     tags:
       - { name: drupal.command }
+  console.create_roles:
+    class: Drupal\Console\Command\Create\RolesCommand
+    arguments: ['@console.create_role_data']
+    tags:
+      - { name: drupal.command }

config/services/debug.yml

@@ -28,7 +28,7 @@ services:
       - { name: drupal.command }
   console.views_debug:
     class: Drupal\Console\Command\Debug\ViewsCommand
-    arguments: ['@entity_type.manager']
+    arguments: ['@entity_type.manager', '@?plugin.manager.views.display']
     tags:
       - { name: drupal.command }
   console.views_plugins_debug:
@@ -57,7 +57,7 @@ services:
       - { name: drupal.command }
   console.queue_debug:
     class: Drupal\Console\Command\Debug\QueueCommand
-    arguments: ['@plugin.manager.queue_worker']
+    arguments: ['@queue', '@plugin.manager.queue_worker']
     tags:
       - { name: drupal.command }
   console.libraries_debug:
@@ -87,7 +87,7 @@ services:
       - { name: drupal.command }
   console.database_table_debug:
     class: Drupal\Console\Command\Debug\DatabaseTableCommand
-    arguments: ['@console.redbean', '@database']
+    arguments: ['@database']
     tags:
       - { name: drupal.command }
   console.cron_debug:
@@ -142,3 +142,8 @@ services:
     class: Drupal\Console\Command\Debug\FeaturesCommand
     tags:
       - { name: drupal.command }
+  console.roles_debug:
+    class: Drupal\Console\Command\Debug\RolesCommand
+    arguments: ['@console.drupal_api']
+    tags:
+      - { name: drupal.command }

config/services/generate.yml

@@ -6,87 +6,92 @@ services:
        - { name: drupal.command }
   console.generate_modulefile:
     class: Drupal\Console\Command\Generate\ModuleFileCommand
-    arguments: ['@console.extension_manager', '@console.modulefile_generator']
+    arguments: ['@console.extension_manager', '@console.modulefile_generator', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_authentication_provider:
     class: Drupal\Console\Command\Generate\AuthenticationProviderCommand
-    arguments: ['@console.extension_manager', '@console.authentication_provider_generator', '@console.string_converter']
+    arguments: ['@console.extension_manager', '@console.authentication_provider_generator', '@console.string_converter', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_controller:
     class: Drupal\Console\Command\Generate\ControllerCommand
     arguments: ['@console.extension_manager', '@console.controller_generator', '@console.string_converter', '@console.validator', '@router.route_provider', '@console.chain_queue']
     tags:
        - { name: drupal.command }
+  console.generate_ajax:
+    class: Drupal\Console\Command\Generate\AjaxCommand
+    arguments: ['@console.extension_manager', '@console.ajax_command_generator', '@console.validator', '@console.chain_queue']
+    tags:
+       - { name: drupal.command }      
   console.generate_breakpoint:
     class: Drupal\Console\Command\Generate\BreakPointCommand
     arguments: ['@console.breakpoint_generator', '@app.root', '@theme_handler', '@console.validator', '@console.string_converter']
     tags:
       - { name: drupal.command }
   console.generate_help:
     class: Drupal\Console\Command\Generate\HelpCommand
-    arguments: ['@console.help_generator', '@console.site', '@console.extension_manager', '@console.chain_queue']
+    arguments: ['@console.help_generator', '@console.site', '@console.extension_manager', '@console.chain_queue', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_form:
     class: Drupal\Console\Command\Generate\FormBaseCommand
-    arguments: ['@console.extension_manager', '@console.form_generator', '@console.chain_queue', '@console.string_converter', '@plugin.manager.element_info', '@router.route_provider']
+    arguments: ['@console.translator_manager', '@console.extension_manager', '@console.form_generator', '@console.chain_queue', '@console.string_converter', '@console.validator', '@plugin.manager.element_info', '@router.route_provider']
     tags:
        - { name: drupal.command }
   console.generate_form_alter:
     class: Drupal\Console\Command\Generate\FormAlterCommand
-    arguments: ['@console.extension_manager', '@console.form_alter_generator', '@console.string_converter', '@module_handler', '@plugin.manager.element_info', '@?profiler', '@app.root', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.form_alter_generator', '@console.string_converter', '@module_handler', '@plugin.manager.element_info', '@?profiler', '@app.root', '@console.chain_queue', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_permissions:
     class: Drupal\Console\Command\Generate\PermissionCommand
-    arguments: ['@console.extension_manager', '@console.string_converter', '@console.permission_generator']
+    arguments: ['@console.extension_manager', '@console.string_converter', '@console.permission_generator', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_event_subscriber:
     class: Drupal\Console\Command\Generate\EventSubscriberCommand
-    arguments: ['@console.extension_manager', '@console.event_subscriber_generator', '@console.string_converter', '@event_dispatcher', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.event_subscriber_generator', '@console.string_converter', '@console.validator', '@event_dispatcher', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_form_config:
     class: Drupal\Console\Command\Generate\ConfigFormBaseCommand
-    arguments: ['@console.extension_manager', '@console.form_generator', '@console.string_converter', '@router.route_provider', '@plugin.manager.element_info', '@app.root', '@console.chain_queue']
+    arguments: ['@console.translator_manager', '@console.extension_manager', '@console.form_generator', '@console.string_converter', '@console.validator', '@router.route_provider', '@plugin.manager.element_info', '@app.root', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_plugin_type_annotation:
     class: Drupal\Console\Command\Generate\PluginTypeAnnotationCommand
-    arguments: ['@console.extension_manager', '@console.plugin_type_annotation_generator', '@console.string_converter']
+    arguments: ['@console.extension_manager', '@console.plugin_type_annotation_generator', '@console.string_converter', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_plugin_condition:
     class: Drupal\Console\Command\Generate\PluginConditionCommand
-    arguments: ['@console.extension_manager', '@console.plugin_condition_generator', '@console.chain_queue', '@entity_type.repository', '@console.string_converter']
+    arguments: ['@console.extension_manager', '@console.plugin_condition_generator', '@console.chain_queue', '@entity_type.repository', '@console.string_converter', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_plugin_field:
     class: Drupal\Console\Command\Generate\PluginFieldCommand
-    arguments: ['@console.extension_manager','@console.string_converter', '@console.chain_queue']
+    arguments: ['@console.extension_manager','@console.string_converter', '@console.validator', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_plugin_field_formatter:
     class: Drupal\Console\Command\Generate\PluginFieldFormatterCommand
-    arguments: ['@console.extension_manager', '@console.plugin_field_formatter_generator','@console.string_converter', '@plugin.manager.field.field_type', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.plugin_field_formatter_generator','@console.string_converter', '@console.validator', '@plugin.manager.field.field_type', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_plugin_field_type:
     class: Drupal\Console\Command\Generate\PluginFieldTypeCommand
-    arguments: ['@console.extension_manager', '@console.plugin_field_type_generator','@console.string_converter', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.plugin_field_type_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_plugin_field_widget:
     class: Drupal\Console\Command\Generate\PluginFieldWidgetCommand
-    arguments: ['@console.extension_manager', '@console.plugin_field_widget_generator','@console.string_converter', '@plugin.manager.field.field_type', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.plugin_field_widget_generator','@console.string_converter',  '@console.validator', '@plugin.manager.field.field_type', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_plugin_image_effect:
     class: Drupal\Console\Command\Generate\PluginImageEffectCommand
-    arguments: ['@console.extension_manager', '@console.plugin_image_effect_generator','@console.string_converter', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.plugin_image_effect_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_plugin_image_formatter:
@@ -106,17 +111,17 @@ services:
        - { name: drupal.command }
   console.generate_plugin_migrate_process:
     class: Drupal\Console\Command\Generate\PluginMigrateProcessCommand
-    arguments: [ '@console.plugin_migrate_process_generator', '@console.chain_queue', '@console.extension_manager', '@console.string_converter']
+    arguments: [ '@console.plugin_migrate_process_generator', '@console.chain_queue', '@console.extension_manager', '@console.string_converter', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_plugin_rest_resource:
     class: Drupal\Console\Command\Generate\PluginRestResourceCommand
-    arguments: ['@console.extension_manager', '@console.plugin_rest_resource_generator','@console.string_converter', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.plugin_rest_resource_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_plugin_rules_action:
     class: Drupal\Console\Command\Generate\PluginRulesActionCommand
-    arguments: ['@console.extension_manager', '@console.plugin_rules_action_generator','@console.string_converter', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.plugin_rules_action_generator','@console.string_converter', '@console.validator', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_plugin_skeleton:
@@ -126,12 +131,12 @@ services:
        - { name: drupal.command }
   console.generate_plugin_type_yaml:
     class: Drupal\Console\Command\Generate\PluginTypeYamlCommand
-    arguments: ['@console.extension_manager', '@console.plugin_type_yaml_generator','@console.string_converter']
+    arguments: ['@console.extension_manager', '@console.plugin_type_yaml_generator','@console.string_converter', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_plugin_views_field:
     class: Drupal\Console\Command\Generate\PluginViewsFieldCommand
-    arguments: ['@console.extension_manager', '@console.plugin_views_field_generator', '@console.site','@console.string_converter','@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.plugin_views_field_generator', '@console.site','@console.string_converter', '@console.validator', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_post_update:
@@ -146,12 +151,12 @@ services:
        - { name: drupal.command }
   console.generate_route_subscriber:
     class: Drupal\Console\Command\Generate\RouteSubscriberCommand
-    arguments: ['@console.extension_manager', '@console.route_subscriber_generator', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.route_subscriber_generator', '@console.chain_queue', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_service:
     class: Drupal\Console\Command\Generate\ServiceCommand
-    arguments: ['@console.extension_manager', '@console.service_generator', '@console.string_converter', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.service_generator', '@console.string_converter', '@console.validator', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_theme:
@@ -161,12 +166,12 @@ services:
        - { name: drupal.command }
   console.generate_twig_extension:
     class: Drupal\Console\Command\Generate\TwigExtensionCommand
-    arguments: ['@console.extension_manager', '@console.twig_extension_generator', '@console.site', '@console.string_converter', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.twig_extension_generator', '@console.site', '@console.string_converter', '@console.validator', '@console.chain_queue']
     tags:
        - { name: drupal.command }
   console.generate_update:
     class: Drupal\Console\Command\Generate\UpdateCommand
-    arguments: ['@console.extension_manager', '@console.update_generator', '@console.site', '@console.chain_queue']
+    arguments: ['@console.extension_manager', '@console.update_generator', '@console.site', '@console.chain_queue', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_pluginblock:
@@ -181,7 +186,7 @@ services:
        - { name: drupal.command }
   console.generate_ckeditorbutton:
     class: Drupal\Console\Command\Generate\PluginCKEditorButtonCommand
-    arguments: ['@console.chain_queue', '@console.command_ckeditorbutton', '@console.extension_manager', '@console.string_converter']
+    arguments: ['@console.chain_queue', '@console.command_ckeditorbutton', '@console.extension_manager', '@console.string_converter', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_entitycontent:
@@ -201,7 +206,7 @@ services:
        - { name: drupal.command }
   console.generate_cache_context:
     class: Drupal\Console\Command\Generate\CacheContextCommand
-    arguments: [ '@console.cache_context_generator', '@console.chain_queue', '@console.extension_manager', '@console.string_converter']
+    arguments: [ '@console.cache_context_generator', '@console.chain_queue', '@console.extension_manager', '@console.string_converter', '@console.validator']
     tags:
        - { name: drupal.command }
   console.generate_js_test:

config/services/generator.yml

@@ -22,6 +22,11 @@ services:
     arguments: ['@console.extension_manager']
     tags:
       - { name: drupal.generator }
+  console.ajax_command_generator:
+    class: Drupal\Console\Generator\AjaxCommandGenerator
+    arguments: ['@console.extension_manager']
+    tags:
+      - { name: drupal.generator }    
   console.breakpoint_generator:
     class: Drupal\Console\Generator\BreakPointGenerator
     arguments: ['@console.extension_manager']

config/services/rest.yml

@@ -10,7 +10,6 @@ services:
       - '@?plugin.manager.rest'
       - '@authentication_collector'
       - '@config.factory'
-      - "@=container.hasParameter('serializer.formats') ? parameter('serializer.formats') : []"
       - '@entity.manager'
     tags:
       - { name: drupal.command }