From 16820b48f861bbe9806ee93b553feddc6a5cf52d Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 3 Nov 2021 19:58:24 +0100 Subject: [PATCH] Getting Grale/WebDAV PHP 8.0 compatible by using forked and fixed egroupware/guzzlehttp:3.9.3 --- composer.json | 3 +- composer.lock | 141 ++++++++++++++++++++++++++------------------------ 2 files changed, 73 insertions(+), 71 deletions(-) diff --git a/composer.json b/composer.json index a0aea96b34..3e6422e378 100644 --- a/composer.json +++ b/composer.json @@ -95,7 +95,6 @@ "egroupware/collabora": "self.version", "egroupware/compress": "^2.2.3", "egroupware/crypt": "^2.7.13", - "egroupware/guzzlestream": "dev-master", "egroupware/icalendar": "^2.1.9", "egroupware/imap-client": "2.30.4", "egroupware/magicsuggest": "^2.1", @@ -108,7 +107,7 @@ "egroupware/status": "self.version", "egroupware/swoolepush": "self.version", "egroupware/tracker": "self.version", - "egroupware/webdav": "^v0.3.1", + "egroupware/webdav": "^v0.3.2", "egroupware/z-push-dev": "^2.5", "giggsey/libphonenumber-for-php": "^8.12", "npm-asset/as-jqplot": "1.0.*", diff --git a/composer.lock b/composer.lock index 8d679d01d9..e3d2d0d48a 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": "5a9ac5a19bb28961cbb8215f95ea72b9", + "content-hash": "7caa16a5ff78c32472d6d8bd4c61814b", "packages": [ { "name": "adldap2/adldap2", @@ -1092,18 +1092,80 @@ }, "time": "2017-11-11T00:00:00+00:00" }, + { + "name": "egroupware/guzzlehttp", + "version": "3.9.3", + "target-dir": "Guzzle/Http", + "source": { + "type": "git", + "url": "https://github.com/EGroupware/guzzlehttp.git", + "reference": "761951f0cb98109275cfd95776ab3725a903389c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/EGroupware/guzzlehttp/zipball/761951f0cb98109275cfd95776ab3725a903389c", + "reference": "761951f0cb98109275cfd95776ab3725a903389c", + "shasum": "" + }, + "require": { + "egroupware/guzzlestream": "^3.9.3", + "guzzle/common": "^3.9.2", + "guzzle/parser": "^3.9.2", + "php": ">=5.3.2" + }, + "replace": { + "guzzle/http": "*" + }, + "suggest": { + "ext-curl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.7-dev" + } + }, + "autoload": { + "psr-0": { + "Guzzle\\Http": "" + } + }, + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "HTTP libraries used by Guzzle", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "Guzzle", + "client", + "curl", + "http", + "http client" + ], + "support": { + "source": "https://github.com/EGroupware/guzzlehttp/tree/3.9.3" + }, + "time": "2021-11-03T17:38:18+00:00" + }, { "name": "egroupware/guzzlestream", - "version": "dev-master", + "version": "3.9.3", "target-dir": "Guzzle/Stream", "source": { "type": "git", - "url": "https://github.com/EGroupware/stream.git", + "url": "https://github.com/EGroupware/guzzlestream.git", "reference": "d29fc35ebf3bd752308520aa5f17a3e5500f6af3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EGroupware/stream/zipball/d29fc35ebf3bd752308520aa5f17a3e5500f6af3", + "url": "https://api.github.com/repos/EGroupware/guzzlestream/zipball/d29fc35ebf3bd752308520aa5f17a3e5500f6af3", "reference": "d29fc35ebf3bd752308520aa5f17a3e5500f6af3", "shasum": "" }, @@ -1695,20 +1757,20 @@ }, { "name": "egroupware/webdav", - "version": "v0.3.1", + "version": "0.3.2", "source": { "type": "git", "url": "https://github.com/EGroupware/WebDAV.git", - "reference": "554b8ed3fb3bc98427f0c1edbba7f9bab9894d4c" + "reference": "639ea0b979ffb75107bcc7f8a37a74acc9410720" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EGroupware/WebDAV/zipball/554b8ed3fb3bc98427f0c1edbba7f9bab9894d4c", - "reference": "554b8ed3fb3bc98427f0c1edbba7f9bab9894d4c", + "url": "https://api.github.com/repos/EGroupware/WebDAV/zipball/639ea0b979ffb75107bcc7f8a37a74acc9410720", + "reference": "639ea0b979ffb75107bcc7f8a37a74acc9410720", "shasum": "" }, "require": { - "guzzle/http": "~3.0", + "egroupware/guzzlehttp": "^3.9.3", "php": ">=5.3.0", "psr/log": "~1.0" }, @@ -1743,7 +1805,7 @@ "stream", "wrapper" ], - "time": "2021-09-10T11:59:20+00:00" + "time": "2021-11-03T18:16:48+00:00" }, { "name": "egroupware/z-push-dev", @@ -2106,64 +2168,6 @@ "abandoned": "guzzle/guzzle", "time": "2014-08-11T04:32:36+00:00" }, - { - "name": "guzzle/http", - "version": "v3.9.2", - "target-dir": "Guzzle/Http", - "source": { - "type": "git", - "url": "https://github.com/Guzzle3/http.git", - "reference": "1e8dd1e2ba9dc42332396f39fbfab950b2301dc5" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/Guzzle3/http/zipball/1e8dd1e2ba9dc42332396f39fbfab950b2301dc5", - "reference": "1e8dd1e2ba9dc42332396f39fbfab950b2301dc5", - "shasum": "" - }, - "require": { - "guzzle/common": "self.version", - "guzzle/parser": "self.version", - "guzzle/stream": "self.version", - "php": ">=5.3.2" - }, - "suggest": { - "ext-curl": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.7-dev" - } - }, - "autoload": { - "psr-0": { - "Guzzle\\Http": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Michael Dowling", - "email": "mtdowling@gmail.com", - "homepage": "https://github.com/mtdowling" - } - ], - "description": "HTTP libraries used by Guzzle", - "homepage": "http://guzzlephp.org/", - "keywords": [ - "Guzzle", - "client", - "curl", - "http", - "http client" - ], - "abandoned": "guzzle/guzzle", - "time": "2014-08-11T04:32:36+00:00" - }, { "name": "guzzle/parser", "version": "v3.9.2", @@ -10731,7 +10735,6 @@ "egroupware/adodb-php": 20, "egroupware/bookmarks": 20, "egroupware/collabora": 20, - "egroupware/guzzlestream": 20, "egroupware/news_admin": 20, "egroupware/openid": 20, "egroupware/projectmanager": 20,