Database bootstrap level before booting kernel.

Switching to the test database connection only happens when
_drupal_bootstrap_database() runs before executing a first query.

To avoid complicating the boostrap with more fine grained level booting, just
boot the DrupalKernel after DRUPAL_BOOTSTRAP_CODE. Getting rid of those levels
is for a seperate issue.

Additionally mirror the changes in the testing files
core/modules/system/tests/http.php and https.php.

1 files changed, 3 insertions, 3 deletions

diff --git a/index.php b/index.php
index df4b2b6a783..200a2de93c3 100644
--- a/index.php
+++ b/index.php
@@ -30,9 +30,6 @@ $request = Request::createFromGlobals();
 // container at some point.
 request($request);
 
-$kernel = new DrupalKernel('prod', FALSE);
-$kernel->boot();
-
 // Bootstrap all of Drupal's subsystems, but do not initialize anything that
 // depends on the fully resolved Drupal path, because path resolution happens
 // during the REQUEST event of the kernel.
@@ -40,6 +37,9 @@ $kernel->boot();
 // @see Drupal\Core\EventSubscriber\LegacyRequestSubscriber;
 drupal_bootstrap(DRUPAL_BOOTSTRAP_CODE);
 
+$kernel = new DrupalKernel('prod', FALSE);
+$kernel->boot();
+
 $response = $kernel->handle($request)->prepare($request)->send();
 
 $kernel->terminate($request, $response);