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

[yaffs-website] / vendor / drush / drush / src / Preflight / PreflightSiteLocator.php

diff --git a/vendor/drush/drush/src/Preflight/PreflightSiteLocator.php b/vendor/drush/drush/src/Preflight/PreflightSiteLocator.php
index 4c051ece0a32cc822e8da79a090cd27e2181c6b6..89bf9b2821cae65d128e1109aabf9ac0d570b6a7 100644 (file)
--- a/vendor/drush/drush/src/Preflight/PreflightSiteLocator.php
+++ b/vendor/drush/drush/src/Preflight/PreflightSiteLocator.php
@@ -4,10 +4,10 @@ namespace Drush\Preflight;
 
 use Drush\Config\Environment;
 use Drush\Preflight\PreflightArgsInterface;
-use Drush\SiteAlias\AliasRecord;
-use Drush\SiteAlias\SiteAliasManager;
-use Drush\SiteAlias\SiteAliasName;
-use Drush\SiteAlias\SiteSpecParser;
+use Consolidation\SiteAlias\AliasRecord;
+use Consolidation\SiteAlias\SiteAliasManager;
+use Consolidation\SiteAlias\SiteAliasName;
+use Consolidation\SiteAlias\SiteSpecParser;
 
 class PreflightSiteLocator
 {
@@ -25,21 +25,19 @@ class PreflightSiteLocator
      * During bootstrap, finds the currently selected site from the parameters
      * provided on the commandline.
      *
+     * If 'false' is returned, that indicates that there was an alias name
+     * provided on the commandline that is either missing or invalid.
+     *
      * @param PreflightArgsInterface $preflightArgs An alias name or site specification
      * @param \Drush\Config\Environment $environment
      * @param string $root The default Drupal root (from site:set, --root or cwd)
      *
-     * @return \Drush\SiteAlias\AliasRecord
-     * @throws \Exception
+     * @return \Consolidation\SiteAlias\AliasRecord|false
      */
     public function findSite(PreflightArgsInterface $preflightArgs, Environment $environment, $root)
     {
         $aliasName = $preflightArgs->alias();
-        $selfAliasRecord = $this->determineSelf($preflightArgs, $environment, $root);
-        if (!$selfAliasRecord) {
-            throw new \Exception("The alias $aliasName could not be found.");
-        }
-        return $selfAliasRecord;
+        return $this->determineSelf($preflightArgs, $environment, $root);
     }
 
     /**
@@ -51,7 +49,7 @@ class PreflightSiteLocator
      * @param \Drush\Config\Environment $environment
      * @param $root
      *
-     * @return \Drush\SiteAlias\AliasRecord
+     * @return \Consolidation\SiteAlias\AliasRecord
      */
     protected function determineSelf(PreflightArgsInterface $preflightArgs, Environment $environment, $root)
     {
@@ -92,7 +90,7 @@ class PreflightSiteLocator
      * @param \Drush\Preflight\PreflightArgsInterface $preflightArgs
      * @param $root
      *
-     * @return \Drush\SiteAlias\AliasRecord
+     * @return \Consolidation\SiteAlias\AliasRecord
      */
     protected function buildSelf(PreflightArgsInterface $preflightArgs, $root)
     {