8 to master

box.json.dist

@@ -3,7 +3,7 @@
   "chmod": "0755",
   "compactors": [],
   "directories": ["commands", "docs", "examples", "includes", "lib", "misc"],
-    "files": ["drush.api.php", "drush.complete.sh", "drush.info", "drush.launcher", "drush.php", "drush-services.yml", "drush_logo-black.png", "README.md"],
+  "files": ["drush.api.php", "drush.complete.sh", "drush.info", "drush.launcher", "drush.php", "drush-services.yml", "drush_logo-black.png", "README.md"],
   "finder": [
     {
       "name": "*.php",

commands/core/help.drush.inc

@@ -100,7 +100,8 @@ function drush_core_help($name = '') {
   }
 
   // For speed, only bootstrap up to DRUSH_BOOTSTRAP_DRUPAL_CONFIGURATION.
-  drush_bootstrap_max(DRUSH_BOOTSTRAP_DRUPAL_CONFIGURATION);
+  drush_bootstrap_max();
+  drush_get_commands(true);
   $implemented = drush_get_commands();
   ksort($implemented);
   $command_categories = drush_commands_categorize($implemented);

commands/core/helpsingle.drush.inc

@@ -41,12 +41,19 @@ function drush_core_helpsingle($commandstring) {
   if (!array_key_exists($commandstring, $commands)) {
     // If the command cannot be found, then bootstrap so that
     // additional commands will be brought in.
-    // For speed, only bootstrap up to DRUSH_BOOTSTRAP_DRUPAL_SITE.
-    drush_bootstrap_max(DRUSH_BOOTSTRAP_DRUPAL_SITE);
+    // TODO: We need to do a full bootstrap in order to find module service
+    // commands. We only need to do this for Drupal 8, though; 7 and earlier
+    // can stop at DRUSH_BOOTSTRAP_DRUPAL_SITE. Perhaps we could use command
+    // caching to avoid bootstrapping, if we have collected the commands for
+    // this site once already.
+    drush_bootstrap_max();
     $commands = drush_get_commands();
   }
   if (array_key_exists($commandstring, $commands)) {
     $command = $commands[$commandstring];
+
+    annotationcommand_adapter_add_hook_options($command);
+
     drush_print_help($command);
     return TRUE;
   }

commands/core/site_install.drush.inc

@@ -225,7 +225,7 @@ function drush_core_site_install($profile = NULL) {
   drush_include_engine('drupal', 'site_install');
   drush_core_site_install_version($profile, $form_options);
 
-  // Post installation run the configuration import.
+  // Post installation, run the configuration import.
   if ($config = drush_get_option('config-dir')) {
     // Set the destination site UUID to match the source UUID, to bypass a core fail-safe.
     $source_storage = new FileStorage($config);

commands/make/make.drush.inc

@@ -155,7 +155,7 @@ function make_drush_command() {
       'makefile' => 'Filename of the makefile to convert.',
     ),
     'options' => array(
-      'format' => 'The format to which the make file should be converted. Accepted values include make, composer, and yml.'
+      'format' => 'The format to which the make file should be converted. Accepted values include make, composer, and yml.',
     ),
     'required-arguments' => TRUE,
     'examples' => array(

composer.json

@@ -27,24 +27,20 @@
     "drush.php",
     "drush.complete.sh"
   ],
-  "config": {
-    "platform": {
-      "php": "5.6.0"
-    }
-  },
   "require": {
     "php": ">=5.6.0",
     "psr/log": "~1.0",
     "psy/psysh": "~0.6",
-    "symfony/yaml": "~2.3|~3.0",
-    "symfony/var-dumper": "~2.7|~3.0",
     "league/container": "~2",
     "consolidation/robo": "dev-master",
+    "symfony/config": "~2.2",
     "consolidation/annotated-command": "~2",
     "consolidation/output-formatters": "~2",
-    "symfony/console": "2.7.*",
-    "symfony/event-dispatcher": "2.7.*",
-    "symfony/config": "~2.2",
+    "symfony/yaml": "~2.3",
+    "symfony/var-dumper": "~2.7",
+    "symfony/console": "~2.7",
+    "symfony/event-dispatcher": "~2.7",
+    "symfony/finder": "~2.7",
     "pear/console_table": "~1.3.0",
     "phpdocumentor/reflection-docblock": "^2.0",
     "webmozart/path-util": "~2"