From b0f1a3e7672cb24f2fb4db40539a8edc3cc3928a Mon Sep 17 00:00:00 2001
From: Oliver Hader <oliver@typo3.org>
Date: Sat, 7 Nov 2020 12:04:23 +0100
Subject: [PATCH] [TASK] Upgrade typo3/phar-stream-wrapper to v3.1.6
PHP versions 8.0-RC1, 7.4.12, 7.3.24 introduced a different behavior
for `stream_wrapper_restore()` and would throw a PHP notice which is
mitigated with this phar stream wrapper release.
see https://github.com/TYPO3/phar-stream-wrapper/releases/tag/v3.1.6
composer require typo3/phar-stream-wrapper:^3.1.6
Resolves: #92789
Releases: master, 10.4, 9.5
Change-Id: Ia2bc9b4fd7f568b9a4390205e1d332050904a15b
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/66560
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Helmut Hummel <typo3@helhum.io>
Tested-by: Oliver Hader <oliver.hader@typo3.org>
Reviewed-by: Helmut Hummel <typo3@helhum.io>
Reviewed-by: Oliver Hader <oliver.hader@typo3.org>
---
composer.json | 2 +-
composer.lock | 19 ++++++++++---------
typo3/sysext/core/composer.json | 2 +-
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/composer.json b/composer.json
index 094d80f2f833..45c3ebd40b94 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,7 @@
"typo3/class-alias-loader": "^1.0",
"typo3/cms-cli": "^2.0",
"typo3/cms-composer-installers": "^2.0 || ^3.0",
- "typo3/phar-stream-wrapper": "^3.1.3",
+ "typo3/phar-stream-wrapper": "^3.1.6",
"typo3/symfony-psr-event-dispatcher-adapter": "^1.0 || ^2.0",
"typo3fluid/fluid": "^2.6.8 || ^3"
},
diff --git a/composer.lock b/composer.lock
index 837547cef375..e36845c39905 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "a968cf5c5e4f52e7fb9a4510309cceb0",
+ "content-hash": "613264067bffe26c4464f2ddb6d46a0b",
"packages": [
{
"name": "cogpowered/finediff",
@@ -3883,25 +3883,26 @@
},
{
"name": "typo3/phar-stream-wrapper",
- "version": "v3.1.3",
+ "version": "v3.1.6",
"source": {
"type": "git",
"url": "https://github.com/TYPO3/phar-stream-wrapper.git",
- "reference": "586ff60beea128e069a5dc271d3d8133a9bc460a"
+ "reference": "60131cb573a1e478cfecd34e4ea38e3b31505f75"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/586ff60beea128e069a5dc271d3d8133a9bc460a",
- "reference": "586ff60beea128e069a5dc271d3d8133a9bc460a",
+ "url": "https://api.github.com/repos/TYPO3/phar-stream-wrapper/zipball/60131cb573a1e478cfecd34e4ea38e3b31505f75",
+ "reference": "60131cb573a1e478cfecd34e4ea38e3b31505f75",
"shasum": ""
},
"require": {
"ext-json": "*",
- "php": "^7.0"
+ "php": "^7.0 || ^8.0"
},
"require-dev": {
"ext-xdebug": "*",
- "phpunit/phpunit": "^6.5"
+ "phpspec/prophecy": "^1.10",
+ "symfony/phpunit-bridge": "^5.1"
},
"suggest": {
"ext-fileinfo": "For PHP builtin file type guessing, otherwise uses internal processing"
@@ -3931,9 +3932,9 @@
],
"support": {
"issues": "https://github.com/TYPO3/phar-stream-wrapper/issues",
- "source": "https://github.com/TYPO3/phar-stream-wrapper/tree/v3.1.3"
+ "source": "https://github.com/TYPO3/phar-stream-wrapper/tree/v3.1.6"
},
- "time": "2019-10-18T11:57:16+00:00"
+ "time": "2020-11-07T09:06:16+00:00"
},
{
"name": "typo3/symfony-psr-event-dispatcher-adapter",
diff --git a/typo3/sysext/core/composer.json b/typo3/sysext/core/composer.json
index ebe3f5bf37e5..43c2838e85a5 100644
--- a/typo3/sysext/core/composer.json
+++ b/typo3/sysext/core/composer.json
@@ -59,7 +59,7 @@
"typo3/class-alias-loader": "^1.0",
"typo3/cms-cli": "^2.0",
"typo3/cms-composer-installers": "^2.0 || ^3.0",
- "typo3/phar-stream-wrapper": "^3.1.3",
+ "typo3/phar-stream-wrapper": "^3.1.6",
"typo3/symfony-psr-event-dispatcher-adapter": "^1.0 || ^2.0",
"typo3fluid/fluid": "^2.6.8 || ^3"
},
--
GitLab