Fixes #3277: Site-specific drush.yml file not loaded.

isolation/tests/ConfigLocatorTest.php

@@ -99,7 +99,7 @@ protected function createConfigLocator($isLocal = false, $configPath = '')
         // Make our environment settings available as configuration items
         $configLocator->addEnvironment($this->environment());
 
-        $configLocator->addSitewideConfig($this->siteDir());
+        $configLocator->addDrupalConfig($this->siteDir());
 
         return $configLocator;
     }

src/Commands/core/SiteInstallCommands.php

@@ -276,7 +276,7 @@ public function pre(CommandData $commandData)
             // a fallback name when '--sites-subdir' is not specified, but
             // only if the uri and the folder name match, and only if
             // the sites directory has already been created.
-            $dir = $this->getSitesSubdirFromUri($root, $aliasRecord->get('uri'));
+            $dir = StringUtils::lookupSiteDirFromUri($aliasRecord->get('uri'), $root);
         }
 
         if (!$dir) {
@@ -338,26 +338,6 @@ public function pre(CommandData $commandData)
         }
     }
 
-    /**
-     * Determine an appropriate site subdir name to use for the
-     * provided uri.
-     */
-    protected function getSitesSubdirFromUri($root, $uri)
-    {
-        $dir = strtolower($uri);
-        // Always accept simple uris (e.g. 'dev', 'stage', etc.)
-        if (preg_match('#^[a-z0-9_-]*$#', $dir)) {
-            return $dir;
-        }
-        // Strip off the protocol from the provided uri -- however,
-        // now we will require that the sites subdir already exist.
-        $dir = preg_replace('#[^/]*/*#', '', $dir);
-        if (file_exists(Path::join($root, $dir))) {
-            return $dir;
-        }
-        return false;
-    }
-
     /**
      * Fake the necessary HTTP headers that the Drupal installer still needs:
      * @see https://github.com/drupal/drupal/blob/d260101f1ea8a6970df88d2f1899248985c499fc/core/includes/install.core.inc#L287

src/Config/ConfigLocator.php

@@ -5,6 +5,7 @@
 use Drush\Config\Loader\YamlConfigLoader;
 use Consolidation\Config\Loader\ConfigProcessor;
 use Consolidation\Config\Util\EnvConfig;
+use Drush\Utils\StringUtils;
 use Symfony\Component\Finder\Finder;
 
 /**
@@ -37,7 +38,9 @@ class ConfigLocator
 
     protected $sources = false;
 
-    protected $siteRoots = [];
+    protected $drupalRoots = [];
+
+    protected $siteDirs = [];
 
     protected $composerRoot;
 
@@ -101,7 +104,7 @@ public function __construct($envPrefix = '')
         }
         $this->config->addPlaceholder(self::USER_CONTEXT);
         $this->config->addPlaceholder(self::DRUPAL_CONTEXT);
-        $this->config->addPlaceholder(self::SITE_CONTEXT); // not implemented yet (multisite)
+        $this->config->addPlaceholder(self::SITE_CONTEXT);
         $this->config->addPlaceholder(self::ALIAS_CONTEXT);
         $this->config->addPlaceholder(self::PREFLIGHT_CONTEXT);
         $this->config->addPlaceholder(self::ENVIRONMENT_CONTEXT);
@@ -256,26 +259,64 @@ public function addDrushConfig($drushProjectDir)
      * Add any configuration files found around the Drupal root of the
      * selected site.
      *
-     * @param Path to the selected Drupal site
+     * @param $drupalRoot
+     *   Path to the selected Drupal site.
      * @return $this
      */
-    public function addSitewideConfig($siteRoot)
+    public function addDrupalConfig($drupalRoot)
     {
         // There might not be a site.
-        if (!is_dir($siteRoot)) {
+        if (!is_dir($drupalRoot)) {
             return;
         }
 
         // We might have already processed this root.
-        $siteRoot = realpath($siteRoot);
-        if (in_array($siteRoot, $this->siteRoots)) {
+        $drupalRoot = realpath($drupalRoot);
+        if (in_array($drupalRoot, $this->drupalRoots)) {
             return;
         }
 
         // Remember that we've seen this location.
-        $this->siteRoots[] = $siteRoot;
+        $this->drupalRoots[] = $drupalRoot;
+
+        $this->addConfigPaths(self::DRUPAL_CONTEXT, [ dirname($drupalRoot) . '/drush', "$drupalRoot/drush", "$drupalRoot/sites/all/drush" ]);
+        return $this;
+    }
+
+    /**
+     * Add any configuration files found around the multisite directory.
+     *
+     * @param \Drush\SiteAlias\AliasRecord $alias
+     *   Site URI of the multisite.
+     *
+     * @return $this
+     */
+    public function addSiteConfig($alias)
+    {
+        $uri = $alias->uri() ?: 'default';
+
+        // Parse a fqdn and look for matching entry in sites/sites.php.
+        if (filter_var($uri, FILTER_VALIDATE_URL)) {
+            if ($dir_name = StringUtils::lookupSiteDirFromUri($uri, $alias->root())) {
+                $uri = $dir_name;
+            }
+        }
+
+        // There might not be a site    directory.
+        $site_dir = $alias->root() ."/sites/$uri";
+        if (!is_dir($site_dir)) {
+            return;
+        }
+
+        // We might have already processed this site.
+        if (in_array($site_dir, $this->siteDirs)) {
+            return;
+        }
+
+        // Remember that we've seen this site.
+        $this->siteDirs[] = $site_dir;
 
-        $this->addConfigPaths(self::DRUPAL_CONTEXT, [ dirname($siteRoot) . '/drush', "$siteRoot/drush", "$siteRoot/sites/all/drush" ]);
+        $this->addConfigPaths(self::SITE_CONTEXT, [ "$site_dir", "$site_dir/drush" ]);
         return $this;
     }
 
@@ -381,7 +422,7 @@ public function getSiteAliasPaths($paths, Environment $environment)
     {
         // In addition to the paths passed in to us (from --alias-paths
         // commandline options), add some site-local locations.
-        $base_dirs = array_filter(array_merge($this->siteRoots, [$this->composerRoot]));
+        $base_dirs = array_filter(array_merge($this->drupalRoots, [$this->composerRoot]));
         $site_local_paths = array_map(
             function ($item) {
                 return "$item/drush/sites";

src/Preflight/Preflight.php

@@ -249,7 +249,7 @@ public function preflight($argv)
         // Extend configuration and alias files to include files in
         // target site.
         $root = $this->findSelectedSite();
-        $this->configLocator->addSitewideConfig($root);
+        $this->configLocator->addDrupalConfig($root);
         $this->configLocator->setComposerRoot($this->drupalFinder()->getComposerRoot());
 
         // Look up the locations where alias files may be found.
@@ -276,7 +276,9 @@ public function preflight($argv)
 
         // If we did not redispatch, then add the site-wide config for the
         // new root (if the root did in fact change) and continue.
-        $this->configLocator->addSitewideConfig($root);
+        $this->configLocator->addDrupalConfig($root);
+        // Set multisite config using uri from alias.
+        $this->configLocator->addSiteConfig($selfAliasRecord);
 
         // Remember the paths to all the files we loaded, so that we can
         // report on it from Drush status or wherever else it may be needed.

src/Utils/StringUtils.php

@@ -132,4 +132,42 @@ public static function generatePassword($length = 10)
 
         return $pass;
     }
+
+    /**
+     * Lookup a site's directory via the sites.php file given a uri.
+     *
+     * @param string $uri
+     *   The site URI.
+     * @return string $drupalRoot
+     *   The directory associated with that URI.
+     * @param bool $require_settings
+     *   Only directories with an existing settings.php file will be recognized.
+     *   Defaults to TRUE.
+     * @see \Drupal\Core\DrupalKernel::findSitePath()
+     */
+    public static function lookupSiteDirFromUri($uri, $drupalRoot, $require_settings = true)
+    {
+        if (file_exists($drupalRoot . '/sites/sites.php')) {
+            $sites = [];
+            // This will overwrite $sites with the desired mappings.
+            include($drupalRoot . '/sites/sites.php');
+
+            // This code is adapted from
+            // \Drupal\Core\DrupalKernel::findSitePath().
+            $path = explode('/', parse_url($uri, PHP_URL_PATH));
+            $server = explode('.', implode('.', array_reverse(explode(':', rtrim(parse_url($uri, PHP_URL_HOST), '.')))));
+            for ($i = count($path); $i > 0; $i--) {
+                for ($j = count($server); $j > 0; $j--) {
+                    $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($path, 0, $i));
+                    if (isset($sites[$dir]) && file_exists($drupalRoot . '/sites/' . $sites[$dir])) {
+                        $dir = $sites[$dir];
+                    }
+                    if (file_exists($drupalRoot . '/sites/' . $dir . '/settings.php') || (!$require_settings && file_exists($drupalRoot . '/sites/' . $dir))) {
+                        return "$dir";
+                    }
+                }
+            }
+        }
+        return false;
+    }
 }