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

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
3b742fd8 · Angie Byron · 5355f8cc · 3b742fd8 · 3b742fd8 · 3b742fd8
Commit 3b742fd8 authored Sep 30, 2015 by Angie Byron
--- a/.eslintignore
+++ b/.eslintignore
 core/assets/vendor/**/*
 core/modules/locale/tests/locale_test.js
-core/vendor/**/*
+vendor/**/*
 sites/**/files/**/*
 libraries/**/*
 sites/**/libraries/**/*

--- a/.gitattributes
+++ b/.gitattributes
@@ -51,3 +51,4 @@
 *.png     -text diff
 *.phar    -text diff
 *.exe     -text diff
+*.ttf     -text diff
--- a/autoload.php
+++ b/autoload.php
@@ -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';
--- a/composer.json
+++ b/composer.json
@@ -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"
  }
 }
--- a/core/composer.lock
+++ b/core/composer.lock
@@ -4,8 +4,104 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "hash": "e6a3c80757f0e2a34ecc1cb9332cdab1",
+    "hash": "8c9fdf621ce53640f24b24749e59717c",
+    "content-hash": "f38613812a285c03a1a18458384fe0b1",
    "packages": [
+        {
+            "name": "composer/installers",
+            "version": "v1.0.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
+                "reference": "d64e23fce42a4063d63262b19b8e7c0f3b5e4c45",
+                "shasum": ""
+            },
+            "replace": {
+                "roundcube/plugin-installer": "*",
+                "shama/baton": "*"
+            },
+            "require-dev": {
+                "composer/composer": "1.0.*@dev",
+                "phpunit/phpunit": "4.1.*"
+            },
+            "type": "composer-installer",
+            "extra": {
+                "class": "Composer\\Installers\\Installer",
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Composer\\Installers\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "http://composer.github.com/installers/",
+            "keywords": [
+                "Craft",
+                "Dolibarr",
+                "Hurad",
+                "MODX Evo",
+                "OXID",
+                "SMF",
+                "Thelia",
+                "WolfCMS",
+                "agl",
+                "aimeos",
+                "annotatecms",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "codeigniter",
+                "concrete5",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "elgg",
+                "fuelphp",
+                "grav",
+                "installer",
+                "joomla",
+                "kohana",
+                "laravel",
+                "lithium",
+                "magento",
+                "mako",
+                "mediawiki",
+                "modulework",
+                "moodle",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "puppet",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "symfony",
+                "typo3",
+                "wordpress",
+                "zend",
+                "zikula"
+            ],
+            "time": "2015-02-18 17:17:01"
+        },
        {
            "name": "doctrine/annotations",
            "version": "v1.2.7",
@@ -953,12 +1049,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/ClassLoader.git",
+                "url": "https://github.com/symfony/class-loader.git",
                "reference": "d957ea6295d7016e20d7eff33a6c1deef819c0d4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/ClassLoader/zipball/d957ea6295d7016e20d7eff33a6c1deef819c0d4",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/d957ea6295d7016e20d7eff33a6c1deef819c0d4",
                "reference": "d957ea6295d7016e20d7eff33a6c1deef819c0d4",
                "shasum": ""
            },
@@ -1003,12 +1099,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Console.git",
+                "url": "https://github.com/symfony/console.git",
                "reference": "9ff9032151186bd66ecee727d728f1319f52d1d8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Console/zipball/9ff9032151186bd66ecee727d728f1319f52d1d8",
+                "url": "https://api.github.com/repos/symfony/console/zipball/9ff9032151186bd66ecee727d728f1319f52d1d8",
                "reference": "9ff9032151186bd66ecee727d728f1319f52d1d8",
                "shasum": ""
            },
@@ -1060,12 +1156,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/Debug.git",
+                "url": "https://github.com/symfony/debug.git",
                "reference": "726bf9651d29f53243281d0b6418cfaa5e318281"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/Debug/zipball/726bf9651d29f53243281d0b6418cfaa5e318281",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/726bf9651d29f53243281d0b6418cfaa5e318281",
                "reference": "726bf9651d29f53243281d0b6418cfaa5e318281",
                "shasum": ""
            },
@@ -1115,12 +1211,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/DependencyInjection.git",
+                "url": "https://github.com/symfony/dependency-injection.git",
                "reference": "c0a3a97b9450d77cd8eff81c5825efb3624c255b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DependencyInjection/zipball/c0a3a97b9450d77cd8eff81c5825efb3624c255b",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c0a3a97b9450d77cd8eff81c5825efb3624c255b",
                "reference": "c0a3a97b9450d77cd8eff81c5825efb3624c255b",
                "shasum": ""
            },
@@ -1175,12 +1271,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/EventDispatcher.git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
                "reference": "b58c916f1db03a611b72dd702564f30ad8fe83fa"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/b58c916f1db03a611b72dd702564f30ad8fe83fa",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b58c916f1db03a611b72dd702564f30ad8fe83fa",
                "reference": "b58c916f1db03a611b72dd702564f30ad8fe83fa",
                "shasum": ""
            },
@@ -1233,12 +1329,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/HttpFoundation.git",
+                "url": "https://github.com/symfony/http-foundation.git",
                "reference": "7253c2041652353e71560bbd300d6256d170ddaf"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/7253c2041652353e71560bbd300d6256d170ddaf",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7253c2041652353e71560bbd300d6256d170ddaf",
                "reference": "7253c2041652353e71560bbd300d6256d170ddaf",
                "shasum": ""
            },
@@ -1286,12 +1382,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/HttpKernel.git",
+                "url": "https://github.com/symfony/http-kernel.git",
                "reference": "fd9c7af92c9e3ade1327cc3af10b17731eebc4a7"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/HttpKernel/zipball/fd9c7af92c9e3ade1327cc3af10b17731eebc4a7",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/fd9c7af92c9e3ade1327cc3af10b17731eebc4a7",
                "reference": "fd9c7af92c9e3ade1327cc3af10b17731eebc4a7",
                "shasum": ""
            },
@@ -1837,6 +1933,56 @@
            ],
            "time": "2015-09-22 13:59:32"
        },
+        {
+            "name": "wikimedia/composer-merge-plugin",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/wikimedia/composer-merge-plugin.git",
+                "reference": "47bb3388cfeae41a38087ac8465a7d08fa92ea2e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/47bb3388cfeae41a38087ac8465a7d08fa92ea2e",
+                "reference": "47bb3388cfeae41a38087ac8465a7d08fa92ea2e",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0",
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "composer/composer": "1.0.*@dev",
+                "jakub-onderka/php-parallel-lint": "~0.8",
+                "phpspec/prophecy-phpunit": "~1.0",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                },
+                "class": "Wikimedia\\Composer\\MergePlugin"
+            },
+            "autoload": {
+                "psr-4": {
+                    "Wikimedia\\Composer\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bryan Davis",
+                    "email": "bd808@wikimedia.org"
+                }
+            ],
+            "description": "Composer plugin to merge multiple composer.json files",
+            "time": "2015-09-22 21:14:25"
+        },
        {
            "name": "zendframework/zend-diactoros",
            "version": "1.1.3",
@@ -3212,12 +3358,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/BrowserKit.git",
+                "url": "https://github.com/symfony/browser-kit.git",
                "reference": "277a2457776d4cc25706fbdd9d1e4ab2dac884e4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/BrowserKit/zipball/277a2457776d4cc25706fbdd9d1e4ab2dac884e4",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/277a2457776d4cc25706fbdd9d1e4ab2dac884e4",
                "reference": "277a2457776d4cc25706fbdd9d1e4ab2dac884e4",
                "shasum": ""
            },
@@ -3267,12 +3413,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/CssSelector.git",
+                "url": "https://github.com/symfony/css-selector.git",
                "reference": "ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/CssSelector/zipball/ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad",
                "reference": "ffb5f3b8a75f8d1b9801e74dc6789a0751a670ad",
                "shasum": ""
            },
@@ -3320,12 +3466,12 @@
            "version": "v2.7.4",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/DomCrawler.git",
+                "url": "https://github.com/symfony/dom-crawler.git",
                "reference": "2a161e4ee2b2f33d4153be58df4f6f2a5506936e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/DomCrawler/zipball/2a161e4ee2b2f33d4153be58df4f6f2a5506936e",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2a161e4ee2b2f33d4153be58df4f6f2a5506936e",
                "reference": "2a161e4ee2b2f33d4153be58df4f6f2a5506936e",
                "shasum": ""
            },
@@ -3372,7 +3518,36 @@
    "aliases": [],
    "minimum-stability": "dev",
    "stability-flags": {
-        "behat/mink-goutte-driver": 20
+        "php": 0,
+        "symfony/class-loader": 0,
+        "symfony/console": 0,
+        "symfony/dependency-injection": 0,
+        "symfony/event-dispatcher": 0,
+        "symfony/http-foundation": 0,
+        "symfony/http-kernel": 0,
+        "symfony/routing": 0,
+        "symfony/serializer": 0,
+        "symfony/translation": 0,
+        "symfony/validator": 0,
+        "symfony/process": 0,
+        "symfony/yaml": 0,
+        "twig/twig": 0,
+        "doctrine/common": 0,
+        "doctrine/annotations": 0,
+        "guzzlehttp/guzzle": 0,
+        "symfony-cmf/routing": 0,
+        "easyrdf/easyrdf": 0,
+        "zendframework/zend-feed": 0,
+        "stack/builder": 0,
+        "egulias/email-validator": 0,
+        "masterminds/html5": 0,
+        "symfony/psr-http-message-bridge": 0,
+        "zendframework/zend-diactoros": 0,
+        "behat/mink": 0,
+        "behat/mink-goutte-driver": 20,
+        "mikey179/vfsstream": 0,
+        "phpunit/phpunit": 0,
+        "symfony/css-selector": 0
    },
    "prefer-stable": true,
    "prefer-lowest": false,

--- a/core/modules/simpletest/src/BrowserTestBase.php
+++ b/core/modules/simpletest/src/BrowserTestBase.php
@@ -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.

--- a/core/modules/system/src/Tests/System/HtaccessTest.php
+++ b/core/modules/system/src/Tests/System/HtaccessTest.php
@@ -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.

--- a/core/rebuild.php
+++ b/core/rebuild.php
@@ -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();

--- a/core/vendor/.htaccess
+++ b/core/vendor/.htaccess
--- a/core/vendor/autoload.php
+++ b/core/vendor/autoload.php
--- a/core/vendor/behat/mink-browserkit-driver/.gitignore
+++ b/core/vendor/behat/mink-browserkit-driver/.gitignore
--- a/core/vendor/behat/mink-browserkit-driver/.travis.yml
+++ b/core/vendor/behat/mink-browserkit-driver/.travis.yml
--- a/core/vendor/behat/mink-browserkit-driver/CHANGELOG.md
+++ b/core/vendor/behat/mink-browserkit-driver/CHANGELOG.md
--- a/core/vendor/behat/mink-browserkit-driver/LICENSE
+++ b/core/vendor/behat/mink-browserkit-driver/LICENSE
--- a/core/vendor/behat/mink-browserkit-driver/README.md
+++ b/core/vendor/behat/mink-browserkit-driver/README.md
--- a/core/vendor/behat/mink-browserkit-driver/composer.json
+++ b/core/vendor/behat/mink-browserkit-driver/composer.json
--- a/core/vendor/behat/mink-browserkit-driver/phpunit.xml.dist
+++ b/core/vendor/behat/mink-browserkit-driver/phpunit.xml.dist
--- a/core/vendor/behat/mink-browserkit-driver/src/Behat/Mink/Driver/BrowserKitDriver.php
+++ b/core/vendor/behat/mink-browserkit-driver/src/Behat/Mink/Driver/BrowserKitDriver.php
--- a/core/vendor/behat/mink-browserkit-driver/tests/BrowserKitConfig.php
+++ b/core/vendor/behat/mink-browserkit-driver/tests/BrowserKitConfig.php
--- a/core/vendor/behat/mink-browserkit-driver/tests/Custom/BaseUrlTest.php
+++ b/core/vendor/behat/mink-browserkit-driver/tests/Custom/BaseUrlTest.php