Update Drupal core to 8.2.7

This commit is contained in:
Rob Davies 2017-03-16 15:05:59 +00:00
parent 59b2578442
commit 6fa31ad086
22 changed files with 664 additions and 133 deletions

View file

@ -42,10 +42,11 @@ return array(
'GuzzleHttp\\Promise\\' => array($vendorDir . '/guzzlehttp/promises/src'),
'GuzzleHttp\\' => array($vendorDir . '/guzzlehttp/guzzle/src'),
'Goutte\\' => array($vendorDir . '/fabpot/goutte/Goutte'),
'Drupal\\Driver\\' => array($baseDir . '/drivers/lib/Drupal/Driver'),
'Drupal\\Driver\\' => array($baseDir . '/drivers/lib/Drupal/Driver', $baseDir . '/drivers/lib/Drupal/Driver'),
'Drupal\\Core\\Composer\\' => array($baseDir . '/core/lib/Drupal/Core/Composer'),
'Drupal\\Core\\' => array($baseDir . '/core/lib/Drupal/Core'),
'Drupal\\Component\\' => array($baseDir . '/core/lib/Drupal/Component'),
'Drupal\\Core\\' => array($baseDir . '/core/lib/Drupal/Core', $baseDir . '/core/lib/Drupal/Core'),
'Drupal\\Component\\' => array($baseDir . '/core/lib/Drupal/Component', $baseDir . '/core/lib/Drupal/Component'),
'DrupalComposer\\DrupalScaffold\\' => array($vendorDir . '/drupal-composer/drupal-scaffold/src'),
'Doctrine\\Instantiator\\' => array($vendorDir . '/doctrine/instantiator/src/Doctrine/Instantiator'),
'Composer\\Semver\\' => array($vendorDir . '/composer/semver/src'),
'Behat\\Mink\\Driver\\' => array($vendorDir . '/behat/mink-browserkit-driver/src', $vendorDir . '/behat/mink-goutte-driver/src'),

View file

@ -80,6 +80,7 @@ class ComposerStaticInitDrupal8
'Drupal\\Core\\Composer\\' => 21,
'Drupal\\Core\\' => 12,
'Drupal\\Component\\' => 17,
'DrupalComposer\\DrupalScaffold\\' => 30,
'Doctrine\\Instantiator\\' => 22,
),
'C' =>
@ -241,6 +242,7 @@ class ComposerStaticInitDrupal8
'Drupal\\Driver\\' =>
array (
0 => __DIR__ . '/../..' . '/drivers/lib/Drupal/Driver',
1 => __DIR__ . '/../..' . '/drivers/lib/Drupal/Driver',
),
'Drupal\\Core\\Composer\\' =>
array (
@ -249,10 +251,16 @@ class ComposerStaticInitDrupal8
'Drupal\\Core\\' =>
array (
0 => __DIR__ . '/../..' . '/core/lib/Drupal/Core',
1 => __DIR__ . '/../..' . '/core/lib/Drupal/Core',
),
'Drupal\\Component\\' =>
array (
0 => __DIR__ . '/../..' . '/core/lib/Drupal/Component',
1 => __DIR__ . '/../..' . '/core/lib/Drupal/Component',
),
'DrupalComposer\\DrupalScaffold\\' =>
array (
0 => __DIR__ . '/..' . '/drupal-composer/drupal-scaffold/src',
),
'Doctrine\\Instantiator\\' =>
array (

View file

@ -4278,18 +4278,240 @@
]
},
{
"name": "phpunit/phpunit",
"version": "4.8.27",
"version_normalized": "4.8.27.0",
"name": "drupal-composer/drupal-scaffold",
"version": "dev-master",
"version_normalized": "9999999-dev",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
"url": "https://github.com/drupal-composer/drupal-scaffold.git",
"reference": "3ad465ac853c2e52e6a808f5529859917662c256"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c062dddcb68e44b563f66ee319ddae2b5a322a90",
"reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
"url": "https://api.github.com/repos/drupal-composer/drupal-scaffold/zipball/3ad465ac853c2e52e6a808f5529859917662c256",
"reference": "3ad465ac853c2e52e6a808f5529859917662c256",
"shasum": ""
},
"require": {
"composer-plugin-api": "^1.0.0",
"php": ">=5.4.5"
},
"require-dev": {
"composer/composer": "dev-master",
"phpunit/phpunit": "^4.4.0"
},
"time": "2016-11-05T10:46:44+00:00",
"type": "composer-plugin",
"extra": {
"class": "DrupalComposer\\DrupalScaffold\\Plugin",
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"installation-source": "source",
"autoload": {
"psr-4": {
"DrupalComposer\\DrupalScaffold\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Composer Plugin for updating the Drupal scaffold files when using drupal/core"
},
{
"name": "drupal/core",
"version": "8.2.7",
"version_normalized": "8.2.7.0",
"source": {
"type": "git",
"url": "https://github.com/drupal-composer/drupal-core.git",
"reference": "5d3fb8a93514f23198ac6848b2679ef1026d2326"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/drupal-composer/drupal-core/zipball/5d3fb8a93514f23198ac6848b2679ef1026d2326",
"reference": "5d3fb8a93514f23198ac6848b2679ef1026d2326",
"shasum": ""
},
"require": {
"asm89/stack-cors": "~1.0",
"composer/semver": "~1.0",
"doctrine/annotations": "1.2.*",
"doctrine/common": "2.5.*",
"easyrdf/easyrdf": "0.9.*",
"egulias/email-validator": "1.2.*",
"guzzlehttp/guzzle": "^6.2.1",
"masterminds/html5": "~2.1",
"paragonie/random_compat": "^1|^2",
"php": ">=5.5.9",
"stack/builder": "1.0.*",
"symfony-cmf/routing": "~1.4",
"symfony/class-loader": "~2.8",
"symfony/console": "~2.8",
"symfony/dependency-injection": "~2.8",
"symfony/event-dispatcher": "~2.8",
"symfony/http-foundation": "~2.8",
"symfony/http-kernel": "~2.8",
"symfony/polyfill-iconv": "~1.0",
"symfony/process": "~2.8",
"symfony/psr-http-message-bridge": "v0.2",
"symfony/routing": "~2.8",
"symfony/serializer": "~2.8",
"symfony/translation": "~2.8",
"symfony/validator": "~2.8",
"symfony/yaml": "~2.8",
"twig/twig": "^1.23.1",
"zendframework/zend-diactoros": "~1.1",
"zendframework/zend-feed": "~2.4"
},
"replace": {
"drupal/action": "self.version",
"drupal/aggregator": "self.version",
"drupal/automated_cron": "self.version",
"drupal/ban": "self.version",
"drupal/bartik": "self.version",
"drupal/basic_auth": "self.version",
"drupal/big_pipe": "self.version",
"drupal/block": "self.version",
"drupal/block_content": "self.version",
"drupal/block_place": "self.version",
"drupal/book": "self.version",
"drupal/breakpoint": "self.version",
"drupal/ckeditor": "self.version",
"drupal/classy": "self.version",
"drupal/color": "self.version",
"drupal/comment": "self.version",
"drupal/config": "self.version",
"drupal/config_translation": "self.version",
"drupal/contact": "self.version",
"drupal/content_moderation": "self.version",
"drupal/content_translation": "self.version",
"drupal/contextual": "self.version",
"drupal/core-annotation": "self.version",
"drupal/core-assertion": "self.version",
"drupal/core-bridge": "self.version",
"drupal/core-datetime": "self.version",
"drupal/core-dependency-injection": "self.version",
"drupal/core-diff": "self.version",
"drupal/core-discovery": "self.version",
"drupal/core-event-dispatcher": "self.version",
"drupal/core-file-cache": "self.version",
"drupal/core-filesystem": "self.version",
"drupal/core-gettext": "self.version",
"drupal/core-graph": "self.version",
"drupal/core-http-foundation": "self.version",
"drupal/core-php-storage": "self.version",
"drupal/core-plugin": "self.version",
"drupal/core-proxy-builder": "self.version",
"drupal/core-render": "self.version",
"drupal/core-serialization": "self.version",
"drupal/core-transliteration": "self.version",
"drupal/core-utility": "self.version",
"drupal/core-uuid": "self.version",
"drupal/datetime": "self.version",
"drupal/datetime_range": "self.version",
"drupal/dblog": "self.version",
"drupal/dynamic_page_cache": "self.version",
"drupal/editor": "self.version",
"drupal/entity_reference": "self.version",
"drupal/field": "self.version",
"drupal/field_ui": "self.version",
"drupal/file": "self.version",
"drupal/filter": "self.version",
"drupal/forum": "self.version",
"drupal/hal": "self.version",
"drupal/help": "self.version",
"drupal/history": "self.version",
"drupal/image": "self.version",
"drupal/inline_form_errors": "self.version",
"drupal/language": "self.version",
"drupal/link": "self.version",
"drupal/locale": "self.version",
"drupal/menu_link_content": "self.version",
"drupal/menu_ui": "self.version",
"drupal/migrate": "self.version",
"drupal/migrate_drupal": "self.version",
"drupal/migrate_drupal_ui": "self.version",
"drupal/minimal": "self.version",
"drupal/node": "self.version",
"drupal/options": "self.version",
"drupal/outside_in": "self.version",
"drupal/page_cache": "self.version",
"drupal/path": "self.version",
"drupal/quickedit": "self.version",
"drupal/rdf": "self.version",
"drupal/responsive_image": "self.version",
"drupal/rest": "self.version",
"drupal/search": "self.version",
"drupal/serialization": "self.version",
"drupal/seven": "self.version",
"drupal/shortcut": "self.version",
"drupal/simpletest": "self.version",
"drupal/standard": "self.version",
"drupal/stark": "self.version",
"drupal/statistics": "self.version",
"drupal/syslog": "self.version",
"drupal/system": "self.version",
"drupal/taxonomy": "self.version",
"drupal/telephone": "self.version",
"drupal/text": "self.version",
"drupal/toolbar": "self.version",
"drupal/tour": "self.version",
"drupal/tracker": "self.version",
"drupal/update": "self.version",
"drupal/user": "self.version",
"drupal/views": "self.version",
"drupal/views_ui": "self.version"
},
"require-dev": {
"behat/mink": "~1.7",
"behat/mink-goutte-driver": "~1.2",
"jcalderonzumba/gastonjs": "~1.0.2",
"jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
"mikey179/vfsstream": "~1.2",
"phpunit/phpunit": ">=4.8.28 <5",
"symfony/css-selector": "~2.8"
},
"time": "2017-03-15T20:19:51+00:00",
"type": "drupal-core",
"installation-source": "dist",
"autoload": {
"psr-4": {
"Drupal\\Core\\": "lib/Drupal/Core",
"Drupal\\Component\\": "lib/Drupal/Component",
"Drupal\\Driver\\": "../drivers/lib/Drupal/Driver"
},
"classmap": [
"lib/Drupal.php",
"lib/Drupal/Component/Utility/Timer.php",
"lib/Drupal/Component/Utility/Unicode.php",
"lib/Drupal/Core/Database/Database.php",
"lib/Drupal/Core/DrupalKernel.php",
"lib/Drupal/Core/DrupalKernelInterface.php",
"lib/Drupal/Core/Site/Settings.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"GPL-2.0+"
],
"description": "Drupal is an open source content management platform powering millions of websites and applications."
},
{
"name": "phpunit/phpunit",
"version": "4.8.28",
"version_normalized": "4.8.28.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "558a3a0d28b4cb7e4a593a4fbd2220e787076225"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/558a3a0d28b4cb7e4a593a4fbd2220e787076225",
"reference": "558a3a0d28b4cb7e4a593a4fbd2220e787076225",
"shasum": ""
},
"require": {
@ -4316,7 +4538,7 @@
"suggest": {
"phpunit/php-invoker": "~1.1"
},
"time": "2016-07-21T06:48:14+00:00",
"time": "2016-11-14T06:25:28+00:00",
"bin": [
"phpunit"
],

@ -0,0 +1 @@
Subproject commit 3ad465ac853c2e52e6a808f5529859917662c256

View file

@ -1,4 +1,4 @@
/build export-ignore
*.php diff=php
composer.json merge=ours
src/Runner/Version.php merge=ours

View file

@ -1,20 +1,10 @@
language: php
php:
- 5.3.3
- 5.3
- 5.4
- 5.5
- 5.6
- 7.0
- nightly
- hhvm
matrix:
allow_failures:
- php: 7.0
- php: nightly
- php: hhvm
sudo: false
@ -34,10 +24,4 @@ script:
notifications:
email: false
webhooks:
urls:
- https://webhooks.gitter.im/e/6668f52f3dd4e3f81960
on_success: always
on_failure: always
on_start: false

View file

@ -2,6 +2,12 @@
All notable changes of the PHPUnit 4.8 release series are documented in this file using the [Keep a CHANGELOG](http://keepachangelog.com/) principles.
## [4.8.28] - 2016-11-14
### Fixed
* Improved the fix for [#1955](https://github.com/sebastianbergmann/phpunit/issues/1955): Process isolation fails when running tests with `phpdbg -qrr`
## [4.8.27] - 2016-07-21
### Fixed

View file

@ -1703,7 +1703,7 @@ function assertTag($matcher, $actual, $message = '', $isHtml = true)
/**
* Evaluates a PHPUnit_Framework_Constraint matcher object.
*
* @param mixed$value
* @param mixed $value
* @param PHPUnit_Framework_Constraint $constraint
* @param string $message
*

View file

@ -30,7 +30,7 @@ class PHPUnit_Runner_Version
}
if (self::$version === null) {
$version = new SebastianBergmann\Version('4.8.27', dirname(dirname(__DIR__)));
$version = new SebastianBergmann\Version('4.8.28', dirname(dirname(__DIR__)));
self::$version = $version->getVersion();
}

View file

@ -55,7 +55,7 @@ function __phpunit_run_isolated_test()
$output = $test->getActualOutput();
}
rewind(STDOUT);
@rewind(STDOUT); /* @ as not every STDOUT target stream is rewindable */
if ($stdout = stream_get_contents(STDOUT)) {
$output = $stdout . $output;
}

View file

@ -1,3 +1,3 @@
<?php
eval('?>' . file_get_contents('php://input'));
eval('?>' . file_get_contents('php://stdin'));