Merge pull request #30 from webflo/d8-autoload

Use autoload.php in favour of core/vendor/autoload.php Signed-off-by: Jonathan Hedstrom <[email protected]>
jhedstrom · May 29, 2015 · c5f6715 · c5f6715
1 parent b32ba2c
commit c5f6715
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Drupal/Driver/Cores/Drupal8.php b/src/Drupal/Driver/Cores/Drupal8.php
@@ -27,12 +27,12 @@ public function bootstrap() {
 
     // Bootstrap Drupal.
     chdir(DRUPAL_ROOT);
-    require_once DRUPAL_ROOT . '/core/vendor/autoload.php';
+    $autoloader = require DRUPAL_ROOT . '/autoload.php';
     require_once DRUPAL_ROOT . '/core/includes/bootstrap.inc';
     $this->validateDrupalSite();
 
     $request = Request::createFromGlobals();
-    $kernel = DrupalKernel::createFromRequest($request, \ComposerAutoloaderInitDrupal8::getLoader(), 'prod');
+    $kernel = DrupalKernel::createFromRequest($request, $autoloader, 'prod');
     $kernel->boot();
     $kernel->prepareLegacyRequest($request);
 

diff --git a/src/Drupal/Driver/DrupalDriver.php b/src/Drupal/Driver/DrupalDriver.php
@@ -161,7 +161,7 @@ function getDrupalVersion() {
         // Drupal 7.
         '/includes/bootstrap.inc',
         // Drupal 8.
-        '/core/vendor/autoload.php',
+        '/autoload.php',
         '/core/includes/bootstrap.inc',
       );