PR#98 with changelog entry added (#102)

Author: RoSk0

CHANGELOG.md

@@ -11,6 +11,7 @@ See the main [README.md](./README.md#branch-and-version-naming) for the details
 
 ### Fixed
 - Restored SimpleSAMLphp exception handler (#29, #35)
+- Bootstrap Drupal correctly from inside SimpleSAMLphp (#75, #98)
 
 
 ## [2.10.0-rc.1]

src/DrupalHelper.php

@@ -3,7 +3,9 @@
 namespace SimpleSAML\Module\drupalauth;
 
 use Drupal\Core\DrupalKernel;
+use Drupal\Core\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Route;
 
 class DrupalHelper
 {
@@ -13,6 +15,8 @@ class DrupalHelper
      * Boot Drupal.
      *
      * @param string $drupalRoot Path to Drupal root.
+     *
+     * @see \Drupal\Core\Test\FunctionalTestSetupTrait::initKernel()
      */
     public function bootDrupal(string $drupalRoot)
     {
@@ -22,7 +26,9 @@ public function bootDrupal(string $drupalRoot)
         chdir($drupalRoot);
         $kernel = DrupalKernel::createFromRequest($request, $autoloader, 'prod', true, $drupalRoot);
         $kernel->boot();
-        $kernel->loadLegacyIncludes();
+        $request->attributes->set(RouteObjectInterface::ROUTE_OBJECT, new Route('<none>'));
+        $request->attributes->set(RouteObjectInterface::ROUTE_NAME, '<none>');
+        $kernel->preHandle($request);
         chdir($originalDir);
         \restore_exception_handler();
         \restore_error_handler();