fix PHP 8.0 ValueError by using forked and fixed Horde_Util package

This commit is contained in:
Ralf Becker 2021-11-10 19:40:28 +01:00
parent 2944a00e02
commit 8a6c3b92bc
2 changed files with 72 additions and 29 deletions

View File

@ -58,6 +58,10 @@
"type": "vcs", "type": "vcs",
"url": "https://github.com/egroupware/Imap_Client" "url": "https://github.com/egroupware/Imap_Client"
}, },
{
"type": "vcs",
"url": "https://github.com/egroupware/Util"
},
{ {
"type": "vcs", "type": "vcs",
"url": "https://github.com/IMSGlobal/lti-1-3-php-library" "url": "https://github.com/IMSGlobal/lti-1-3-php-library"
@ -107,6 +111,7 @@
"egroupware/status": "self.version", "egroupware/status": "self.version",
"egroupware/swoolepush": "self.version", "egroupware/swoolepush": "self.version",
"egroupware/tracker": "self.version", "egroupware/tracker": "self.version",
"egroupware/util": "^2.6.2",
"egroupware/webdav": "^v0.3.2", "egroupware/webdav": "^v0.3.2",
"egroupware/z-push-dev": "^2.5", "egroupware/z-push-dev": "^2.5",
"giggsey/libphonenumber-for-php": "^8.12", "giggsey/libphonenumber-for-php": "^8.12",

96
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "de144b0b6d74a96e1d0fa87a0ece2b7c", "content-hash": "aed29e63d8e554d274a38e1ed10e7ae8",
"packages": [ "packages": [
{ {
"name": "adldap2/adldap2", "name": "adldap2/adldap2",
@ -1755,6 +1755,72 @@
"homepage": "https://www.egroupware.org/", "homepage": "https://www.egroupware.org/",
"time": "2021-08-31T17:21:00+00:00" "time": "2021-08-31T17:21:00+00:00"
}, },
{
"name": "egroupware/util",
"version": "2.6.2",
"source": {
"type": "git",
"url": "https://github.com/EGroupware/Util.git",
"reference": "c45016747dfdbb004891fd72f0ff41982aeb45c0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/EGroupware/Util/zipball/c45016747dfdbb004891fd72f0ff41982aeb45c0",
"reference": "c45016747dfdbb004891fd72f0ff41982aeb45c0",
"shasum": ""
},
"require": {
"ext-dom": "*",
"php": "^5.3 || ^7 || ^8"
},
"replace": {
"pear-horde/horde_util": "2.*",
"pear-pear.horde.org/horde_util": "*"
},
"suggest": {
"ext-ctype": "*",
"ext-filter": "*",
"ext-iconv": "*",
"ext-intl": "*",
"ext-json": "*",
"ext-mbstring": "*",
"ext-xml": "*",
"pear-pear.horde.org/Horde_Imap_Client": "^2",
"pear-pear.horde.org/Horde_Test": "^2.1"
},
"type": "library",
"autoload": {
"classmap": [
"lib/"
]
},
"license": [
"LGPL-2.1"
],
"authors": [
{
"name": "Chuck Hagenbuch",
"email": "chuck@horde.org",
"role": "lead"
},
{
"name": "Jan Schneider",
"email": "jan@horde.org",
"role": "lead"
},
{
"name": "Michael Slusarz",
"email": "slusarz@horde.org",
"role": "developer"
}
],
"description": "Utility library",
"homepage": "https://www.horde.org/libraries/Horde_Util",
"support": {
"source": "https://github.com/EGroupware/Util/tree/2.6.2"
},
"time": "2017-11-11T00:00:00+00:00"
},
{ {
"name": "egroupware/webdav", "name": "egroupware/webdav",
"version": "0.3.2", "version": "0.3.2",
@ -3491,34 +3557,6 @@
], ],
"description": "This class represents a single URL and provides methods for manipulating URLs." "description": "This class represents a single URL and provides methods for manipulating URLs."
}, },
{
"name": "pear-pear.horde.org/Horde_Util",
"version": "2.5.9",
"dist": {
"type": "file",
"url": "https://pear.horde.org/get/Horde_Util-2.5.9.tgz"
},
"require": {
"ext-dom": "*",
"php": "<8.0.0.0"
},
"replace": {
"pear-horde/horde_util": "== 2.5.9.0"
},
"type": "pear-library",
"autoload": {
"classmap": [
""
]
},
"include-path": [
"/"
],
"license": [
"LGPL-2.1"
],
"description": "A library that provides functionality useful for all kind of applications."
},
{ {
"name": "pear/archive_tar", "name": "pear/archive_tar",
"version": "1.4.14", "version": "1.4.14",