Skip to content

Commit

Permalink
Update to Drupal 8.7.1. For more information, see https://www.drupal.…
Browse files Browse the repository at this point in the history
  • Loading branch information
Pantheon Automation committed May 8, 2019
1 parent 5520048 commit e4937cd
Show file tree
Hide file tree
Showing 17 changed files with 257 additions and 271 deletions.
13 changes: 7 additions & 6 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/composer.json
Expand Up @@ -31,7 +31,7 @@
"symfony/process": "~3.4.0",
"symfony/polyfill-iconv": "^1.0",
"symfony/yaml": "~3.4.5",
"typo3/phar-stream-wrapper": "^2.0.1",
"typo3/phar-stream-wrapper": "^2.1.1",
"twig/twig": "^1.38.2",
"doctrine/common": "^2.5",
"doctrine/annotations": "^1.2",
Expand Down
2 changes: 1 addition & 1 deletion core/lib/Drupal.php
Expand Up @@ -82,7 +82,7 @@ class Drupal {
/**
* The current system version.
*/
const VERSION = '8.7.0';
const VERSION = '8.7.1';

/**
* Core API compatibility.
Expand Down
1 change: 1 addition & 0 deletions core/lib/Drupal/Core/Composer/Composer.php
Expand Up @@ -19,6 +19,7 @@ class Composer {
'behat/mink' => ['tests', 'driver-testsuite'],
'behat/mink-browserkit-driver' => ['tests'],
'behat/mink-goutte-driver' => ['tests'],
'brumann/polyfill-unserialize' => ['tests'],
'drupal/coder' => ['coder_sniffer/Drupal/Test', 'coder_sniffer/DrupalPractice/Test'],
'doctrine/cache' => ['tests'],
'doctrine/collections' => ['tests'],
Expand Down
7 changes: 0 additions & 7 deletions vendor/brumann/polyfill-unserialize/tests/Foo.php

This file was deleted.

196 changes: 0 additions & 196 deletions vendor/brumann/polyfill-unserialize/tests/UnserializeTest.php

This file was deleted.

15 changes: 8 additions & 7 deletions vendor/composer/installed.json
Expand Up @@ -2122,7 +2122,7 @@
},
{
"name": "Gert de Pagter",
"email": "backendtea@gmail.com"
"email": "BackEndTea@gmail.com"
}
],
"description": "Symfony polyfill for ctype functions",
Expand Down Expand Up @@ -2882,17 +2882,17 @@
},
{
"name": "typo3/phar-stream-wrapper",
"version": "v2.1.0",
"version_normalized": "2.1.0.0",
"version": "v2.1.1",
"version_normalized": "2.1.1.0",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/phar-stream-wrapper.git",
"reference": "b7a21f0859059ed5d9754af8c11f852d43762334"
"reference": "e438b0c78652b33407983eb29d215a1a3f68f6f3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/b7a21f0859059ed5d9754af8c11f852d43762334",
"reference": "b7a21f0859059ed5d9754af8c11f852d43762334",
"url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/e438b0c78652b33407983eb29d215a1a3f68f6f3",
"reference": "e438b0c78652b33407983eb29d215a1a3f68f6f3",
"shasum": ""
},
"require": {
Expand All @@ -2902,9 +2902,10 @@
"php": "^5.3.3|^7.0"
},
"require-dev": {
"ext-xdebug": "*",
"phpunit/phpunit": "^4.8.36"
},
"time": "2019-03-01T17:43:52+00:00",
"time": "2019-05-05T17:30:51+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
Expand Down
1 change: 1 addition & 0 deletions vendor/typo3/phar-stream-wrapper/composer.json
Expand Up @@ -12,6 +12,7 @@
"brumann/polyfill-unserialize": "^1.0"
},
"require-dev": {
"ext-xdebug": "*",
"phpunit/phpunit": "^4.8.36"
},
"autoload": {
Expand Down
6 changes: 6 additions & 0 deletions vendor/typo3/phar-stream-wrapper/src/Collectable.php
Expand Up @@ -15,6 +15,12 @@

interface Collectable
{
/**
* @param PharInvocation $invocation
* @return bool
*/
public function has(PharInvocation $invocation);

/**
* @param PharInvocation $invocation
* @param null $flags
Expand Down
2 changes: 1 addition & 1 deletion vendor/typo3/phar-stream-wrapper/src/Helper.php
Expand Up @@ -93,7 +93,7 @@ public static function removePharPrefix($path)
public static function normalizePath($path)
{
return rtrim(
static::getCanonicalPath(
static::normalizeWindowsPath(
static::removePharPrefix($path)
),
'/'
Expand Down
Expand Up @@ -56,10 +56,15 @@ private function baseFileDoesNotHaveMetaDataIssues($path)
if ($invocation === null) {
return false;
}

// directly return in case invocation was checked before
if ($invocation->getVariable(__CLASS__) === true) {
return true;
}
// otherwise analyze meta-data
try {
$reader = new Reader($invocation->getBaseName());
$reader->resolveContainer()->getManifest()->deserializeMetaData();
$invocation->setVariable(__CLASS__, true);
} catch (DeserializationException $exception) {
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/typo3/phar-stream-wrapper/src/Phar/Container.php
Expand Up @@ -54,6 +54,6 @@ public function getManifest()
*/
public function getAlias()
{
return $this->stub->getMappedAlias() ?: $this->manifest->getAlias();
return $this->manifest->getAlias() ?: $this->stub->getMappedAlias();
}
}

0 comments on commit e4937cd

Please sign in to comment.