autoload: Create a Drupal-specific core/autoload.php, and use it inst…

…ead of the core/vendor/autoload.php generated by Composer.

For the start, this will simply include Composer's autoload.php.

core/authorize.php

@@ -25,7 +25,7 @@
 // Change the directory to the Drupal root.
 chdir('..');
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/autoload.php';
 
 /**
  * Global flag to identify update.php and authorize.php runs.

core/autoload.php

@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @file
+ * Drupal-specific autoload.php to be used instead of the one generated by
+ * Composer.
+ * Having a Drupal-specific autoload.php makes it easier to use a ClassLoader
+ * implementation different from the one provided by Composer.
+ */
+
+// Use the autoload.php generated by Composer.
+return require __DIR__ . '/vendor/autoload.php';

core/includes/bootstrap.inc

@@ -2731,7 +2731,7 @@ function drupal_classloader($class_loader = NULL) {
   if (!isset($loader)) {
 
     // Retrieve the Composer ClassLoader for loading classes.
-    $loader = include __DIR__ . '/../vendor/autoload.php';
+    $loader = include __DIR__ . '/../autoload.php';
 
     // Register the class loader.
     // When configured to use APC, the ApcClassLoader is registered instead.

core/install.php

@@ -8,7 +8,7 @@
 // Change the directory to the Drupal root.
 chdir('..');
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/autoload.php';
 
 /**
  * Global flag to indicate the site is in installation mode.

core/modules/statistics/statistics.php

@@ -9,7 +9,7 @@
 chdir('../../..');
 
 // Load the Drupal bootstrap.
-require_once dirname(dirname(__DIR__)) . '/vendor/autoload.php';
+require_once dirname(dirname(__DIR__)) . '/autoload.php';
 require_once dirname(dirname(__DIR__)) . '/includes/bootstrap.inc';
 drupal_bootstrap(DRUPAL_BOOTSTRAP_VARIABLES);
 

core/modules/system/tests/http.php

@@ -18,6 +18,6 @@
 
 // Change current directory to the Drupal root.
 chdir('../../../..');
-require_once dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
+require_once dirname(dirname(dirname(__DIR__))) . '/autoload.php';
 require_once dirname(dirname(dirname(__DIR__))) . '/includes/bootstrap.inc';
 drupal_handle_request(TRUE);

core/modules/system/tests/https.php

@@ -20,6 +20,6 @@
 
 // Change current directory to the Drupal root.
 chdir('../../../..');
-require_once dirname(dirname(dirname(__DIR__))) . '/vendor/autoload.php';
+require_once dirname(dirname(dirname(__DIR__))) . '/autoload.php';
 require_once dirname(dirname(dirname(__DIR__))) . '/includes/bootstrap.inc';
 drupal_handle_request(TRUE);

core/scripts/run-tests.sh

@@ -4,7 +4,7 @@
  * This script runs Drupal tests from command line.
  */
 
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/../autoload.php';
 
 use Drupal\Core\StreamWrapper\PublicStream;
 

core/tests/bootstrap.php

@@ -1,7 +1,7 @@
 <?php
 
 // Register the namespaces we'll need to autoload from.
-$loader = require __DIR__ . "/../vendor/autoload.php";
+$loader = require __DIR__ . "/../autoload.php";
 $loader->add('Drupal\\Tests', __DIR__);
 
 foreach (scandir(__DIR__ . "/../modules") as $module) {

core/update.php

@@ -22,7 +22,7 @@
 // Change the directory to the Drupal root.
 chdir('..');
 
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/autoload.php';
 
 // Exit early if an incompatible PHP version would cause fatal errors.
 // The minimum version is specified explicitly, as DRUPAL_MINIMUM_PHP is not

index.php

@@ -8,7 +8,7 @@
  * See COPYRIGHT.txt and LICENSE.txt files in the "core" directory.
  */
 
-require_once __DIR__ . '/core/vendor/autoload.php';
+require_once __DIR__ . '/core/autoload.php';
 require_once __DIR__ . '/core/includes/bootstrap.inc';
 
 try {