Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / vendor / drush / drush / src / Application.php

diff --git a/vendor/drush/drush/src/Application.php b/vendor/drush/drush/src/Application.php
index 2b34134fef8cd3958f724cb1ae040bbfddfce356..ca46a3ab7b88b1b631e740f9162a830201804494 100644 (file)
--- a/vendor/drush/drush/src/Application.php
+++ b/vendor/drush/drush/src/Application.php
@@ -5,7 +5,7 @@ use Consolidation\AnnotatedCommand\AnnotatedCommand;
 use Consolidation\AnnotatedCommand\CommandFileDiscovery;
 use Drush\Boot\BootstrapManager;
 use Drush\Runtime\TildeExpansionHook;
-use Drush\SiteAlias\SiteAliasManager;
+use Consolidation\SiteAlias\SiteAliasManager;
 use Drush\Log\LogLevel;
 use Drush\Command\RemoteCommandProxy;
 use Drush\Runtime\RedispatchHook;
@@ -316,6 +316,7 @@ class Application extends SymfonyApplication implements LoggerAwareInterface, Co
 
         $discovery = $this->commandDiscovery();
         $commandClasses = $discovery->discover($commandfileSearchpath, '\Drush');
+
         $this->loadCommandClasses($commandClasses);
 
         // Uncomment the lines below to use Console's built in help and list commands.
@@ -350,6 +351,10 @@ class Application extends SymfonyApplication implements LoggerAwareInterface, Co
         $discovery = new CommandFileDiscovery();
         $discovery
             ->setIncludeFilesAtBase(true)
+            ->setSearchDepth(3)
+            ->ignoreNamespacePart('contrib', 'Commands')
+            ->ignoreNamespacePart('custom', 'Commands')
+            ->ignoreNamespacePart('src')
             ->setSearchLocations(['Commands', 'Hooks', 'Generators'])
             ->setSearchPattern('#.*(Command|Hook|Generator)s?.php$#');
         return $discovery;