Commit 3b742fd8 authored by webchick's avatar webchick

Issue #2380389 by webflo, Mile23, davidwbarratt, timmillwood, hussainweb,...

Issue #2380389 by webflo, Mile23, davidwbarratt, timmillwood, hussainweb, tstoeckler, bojanz, yched, MKorostoff, alexpott, webchick: Use a single vendor directory in the root
parent 5355f8cc

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
core/assets/vendor/**/*
core/modules/locale/tests/locale_test.js
core/vendor/**/*
vendor/**/*
sites/**/files/**/*
libraries/**/*
sites/**/libraries/**/*
......
......@@ -51,3 +51,4 @@
*.png -text diff
*.phar -text diff
*.exe -text diff
*.ttf -text diff
......@@ -4,11 +4,6 @@
* @file
* Includes the autoloader created by Composer.
*
* This file can be edited to change the autoloader if you are managing a
* project's dependencies using Composer. If Drupal code requires the
* autoloader, it should always be loaded using this file so that projects
* using Composer continue to work.
*
* @see composer.json
* @see index.php
* @see core/install.php
......@@ -16,4 +11,4 @@
* @see core/modules/statistics/statistics.php
*/
return require __DIR__ . '/core/vendor/autoload.php';
return require __DIR__ . '/vendor/autoload.php';
......@@ -5,6 +5,9 @@
"license": "GPL-2.0+",
"require": {
"composer/installers": "^1.0.21",
"wikimedia/composer-merge-plugin": "^1.3.0"
},
"replace": {
"drupal/core": "~8.0"
},
"minimum-stability": "dev",
......@@ -15,8 +18,25 @@
},
"extra": {
"_readme": [
"By default Drupal loads the autoloader from ./core/vendor/autoload.php.",
"By default Drupal loads the autoloader from ./vendor/autoload.php.",
"To change the autoloader you can edit ./autoload.php."
]
],
"merge-plugin": {
"include": [
"core/composer.json"
],
"recurse": false,
"replace": false,
"merge-extra": false
}
},
"autoload": {
"psr-4": {
"Drupal\\Core\\Composer\\": "core/lib/Drupal/Core/Composer"
}
},
"scripts": {
"pre-autoload-dump": "Drupal\\Core\\Composer\\Composer::preAutoloadDump",
"post-autoload-dump": "Drupal\\Core\\Composer\\Composer::ensureHtaccess"
}
}
This diff is collapsed.
This diff is collapsed.
......@@ -1010,7 +1010,7 @@ private function changeDatabasePrefix() {
*/
protected function prepareEnvironment() {
// Bootstrap Drupal so we can use Drupal's built in functions.
$this->classLoader = require __DIR__ . '/../../../vendor/autoload.php';
$this->classLoader = require __DIR__ . '/../../../../autoload.php';
$request = Request::createFromGlobals();
$kernel = TestRunnerKernel::createFromRequest($request, $this->classLoader);
// TestRunnerKernel expects the working directory to be DRUPAL_ROOT.
......
......@@ -68,14 +68,14 @@ protected function getProtectedFiles() {
$file_paths["$path/access_test.$file_ext"] = 403;
}
// Tests the .htaccess file in core/vendor and created by a Composer script.
// Tests the .htaccess file in vendor and created by a Composer script.
// Try and access a non PHP file in the vendor directory.
// @see Drupal\\Core\\Composer\\Composer::ensureHtaccess
$file_paths['core/vendor/composer/installed.json'] = 403;
$file_paths['vendor/composer/installed.json'] = 403;
// Tests the rewrite conditions and rule that denies access to php files.
$file_paths['core/lib/Drupal.php'] = 403;
$file_paths['core/vendor/autoload.php'] = 403;
$file_paths['vendor/autoload.php'] = 403;
$file_paths['autoload.php'] = 403;
// Test extensions that should be permitted.
......
......@@ -20,7 +20,7 @@
// Change the directory to the Drupal root.
chdir('..');
$autoloader = require_once __DIR__ . '/vendor/autoload.php';
$autoloader = require_once __DIR__ . '/../autoload.php';
require_once __DIR__ . '/includes/utility.inc';
$request = Request::createFromGlobals();
......
This diff is collapsed.
<?php
// autoload_files.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
$vendorDir . '/guzzlehttp/promises/src/functions_include.php',
$vendorDir . '/guzzlehttp/psr7/src/functions_include.php',
$vendorDir . '/guzzlehttp/guzzle/src/functions_include.php',
$baseDir . '/lib/Drupal.php',
);
<?php
// autoload_namespaces.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);
return array(
'phpDocumentor' => array($vendorDir . '/phpdocumentor/reflection-docblock/src'),
'org\\bovigo\\vfs\\' => array($vendorDir . '/mikey179/vfsStream/src/main/php'),
'Twig_' => array($vendorDir . '/twig/twig/lib'),
'Stack' => array($vendorDir . '/stack/builder/src'),
'Psr\\Log\\' => array($vendorDir . '/psr/log'),
'Prophecy\\' => array($vendorDir . '/phpspec/prophecy/src'),
'Egulias\\' => array($vendorDir . '/egulias/email-validator/src'),
'EasyRdf_' => array($vendorDir . '/easyrdf/easyrdf/lib'),
'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib'),
'Doctrine\\Common\\Inflector\\' => array($vendorDir . '/doctrine/inflector/lib'),
'Doctrine\\Common\\Collections\\' => array($vendorDir . '/doctrine/collections/lib'),
'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib'),
'Doctrine\\Common\\Annotations\\' => array($vendorDir . '/doctrine/annotations/lib'),
'Doctrine\\Common\\' => array($vendorDir . '/doctrine/common/lib'),
'Behat\\Mink\\Driver' => array($vendorDir . '/behat/mink-browserkit-driver/src'),
);
<?php
// autoload_psr4.php @generated by Composer
$vendorDir = dirname(dirname(__FILE__));
$baseDir = dirname($vendorDir);