Update to Drupal 8.0.6. For more information, see https://www.drupal.org/drupal-8.0.6-release-notes

This commit is contained in:
Pantheon Automation 2016-04-07 11:19:57 -07:00 committed by Greg Anderson
parent 4297c64508
commit b11a755ba8
159 changed files with 2340 additions and 543 deletions

View file

@ -1,6 +0,0 @@
{
"phabricator.uri" : "https://phabricator.wikimedia.org/",
"repository.callsign" : "GCMP",
"history.immutable" : false,
"unit.engine": "PhpunitTestEngine"
}

View file

@ -1,13 +0,0 @@
{
"exclude": "(^vendor/)",
"linters": {
"php": {
"type": "php",
"include": "(\\.php$)"
},
"json": {
"type": "json",
"include": "(\\.json$)"
}
}
}

View file

@ -120,6 +120,7 @@ class ExtraPackage
}
/**
* @param string $json
* @return CompletePackage
*/
protected function loadPackage($json)
@ -350,12 +351,14 @@ class ExtraPackage
$links = $this->package->{$getter}();
if (!empty($links)) {
$unwrapped = self::unwrapIfNeeded($root, $setter);
// @codeCoverageIgnoreStart
if ($root !== $unwrapped) {
$this->logger->warning(
'This Composer version does not support ' .
"'{$type}' merging for aliased packages."
);
}
// @codeCoverageIgnoreEnd
$unwrapped->{$setter}(array_merge(
$root->{$getter}(),
$this->replaceSelfVersionDependencies($type, $links, $root)
@ -437,9 +440,24 @@ class ExtraPackage
$prettyVersion = $root->getPrettyVersion();
$vp = new VersionParser();
$method = 'get' . ucfirst($linkType['method']);
$packages = $root->$method();
return array_map(
function ($link) use ($linkType, $version, $prettyVersion, $vp) {
function ($link) use ($linkType, $version, $prettyVersion, $vp, $packages) {
if ('self.version' === $link->getPrettyConstraint()) {
if (isset($packages[$link->getSource()])) {
/** @var Link $package */
$package = $packages[$link->getSource()];
return new Link(
$link->getSource(),
$link->getTarget(),
$vp->parseConstraints($package->getConstraint()->getPrettyString()),
$linkType['description'],
$package->getPrettyConstraint()
);
}
return new Link(
$link->getSource(),
$link->getTarget(),
@ -475,12 +493,14 @@ class ExtraPackage
RootPackageInterface $root,
$method = 'setExtra'
) {
// @codeCoverageIgnoreStart
if ($root instanceof RootAliasPackage &&
!method_exists($root, $method)
) {
// Unwrap and return the aliased RootPackage.
$root = $root->getAliasOf();
}
// @codeCoverageIgnoreEnd
return $root;
}
}