Don't call bootstrapValidate commands repeatedly, and add --uri tests (#3978)

Author: rmuit

src/Boot/BootstrapManager.php

@@ -346,9 +346,9 @@ public function bootstrapValidate($phase)
         $phases = $this->bootstrapPhases(true);
         static $result_cache = [];
 
-        if (!array_key_exists($phase, $result_cache)) {
-            $validated_phase = -1;
-            foreach ($phases as $phase_index => $current_phase) {
+        $validated_phase = -1;
+        foreach ($phases as $phase_index => $current_phase) {
+            if (!array_key_exists($phase_index, $result_cache)) {
                 if ($phase_index > $phase) {
                     break;
                 }

sut/sites/example.sites.php

@@ -53,3 +53,6 @@
  * @see \Drupal\Core\DrupalKernel::getSitePath()
  * @see https://www.drupal.org/documentation/install/multi-site
  */
+// The following are used by functional tests, at least testOptionsUri():
+$sites["test.uri"] = "dev";
+$sites["test.uri.subpath"] = "stage";

tests/functional/CoreTest.php

@@ -40,23 +40,40 @@ public function testSiteSelectionViaCwd()
 
     public function testOptionsUri()
     {
-        // Put a yml file in the drush folder.
+        // Test whether a URI in a config file resolves correctly, and test
+        // various URI values for their expected Site URI and path.
         $drush_config_file = Path::join($this->webrootSlashDrush(), 'drush.yml');
-        $test_uri = 'http://test.uri';
-        $options_with_uri = [
-        'options' => [
-        'uri' => $test_uri,
-        ],
-        ];
-        $options = [
+        $command_options = [
         'format' => 'json',
         'uri' => 'OMIT', // A special value which causes --uri to not be specified.
         ];
-        file_put_contents($drush_config_file, Yaml::dump($options_with_uri, PHP_INT_MAX, 2));
-        $this->drush('core-status', [], $options);
-        unlink($drush_config_file);
-        $output = $this->getOutputFromJSON();
-        $this->assertEquals($test_uri, $output->uri);
+        foreach ([
+                   'test.uri' => ['http://test.uri', 'sites/dev'],
+                   'test.uri/' => ['http://test.uri/', 'sites/dev'],
+                   'test.uri/subpath' => ['http://test.uri/subpath', 'sites/stage'],
+                   'test.uri/subpath/' => ['http://test.uri/subpath/', 'sites/stage'],
+                   'http://test.uri' => ['http://test.uri', 'sites/dev'],
+                   'http://test.uri/' => ['http://test.uri/', 'sites/dev'],
+                   'http://test.uri/subpath' => ['http://test.uri/subpath', 'sites/stage'],
+                   'http://test.uri/subpath/' => ['http://test.uri/subpath/', 'sites/stage'],
+                   'https://test.uri' => ['https://test.uri', 'sites/dev'],
+                   'https://test.uri/' => ['https://test.uri/', 'sites/dev'],
+                   'https://test.uri/subpath' => ['https://test.uri/subpath', 'sites/stage'],
+                   'https://test.uri/subpath/' => ['https://test.uri/subpath/', 'sites/stage'],
+                 ] as $test_uri => $expected) {
+            // Put a yml file in the drush folder.
+            $config_options = [
+              'options' => [
+                'uri' => $test_uri,
+              ],
+            ];
+            file_put_contents($drush_config_file, Yaml::dump($config_options, PHP_INT_MAX, 2));
+            $this->drush('core-status', [], $command_options);
+            unlink($drush_config_file);
+            $output = $this->getOutputFromJSON();
+            // Include the test URI, for some context in errors.
+            $this->assertEquals([$test_uri => $expected], [$test_uri => [$output->uri, $output->site]]);
+        }
     }
 
     public function testRecursiveConfigLoading()