From 3bacbe4d1e3600eaee69c8079bcc8eb0f299532e Mon Sep 17 00:00:00 2001 From: ralf Date: Wed, 20 Apr 2022 21:33:08 +0200 Subject: [PATCH] some work on our dependencies to officially support PHP 8.x --- composer.json | 2 +- composer.lock | 225 ++++++++++++++++++++++++-------------------------- 2 files changed, 111 insertions(+), 116 deletions(-) diff --git a/composer.json b/composer.json index 309ccc4cdd..5e89924628 100644 --- a/composer.json +++ b/composer.json @@ -75,7 +75,7 @@ "bower-asset/jquery": "^1.12.4", "bower-asset/jquery-touchswipe": "1.6.*", "egroupware/activesync": "self.version", - "egroupware/adodb-php": "self.version", + "egroupware/adodb-php": "^5.20.4", "egroupware/bookmarks": "self.version", "egroupware/collabora": "self.version", "egroupware/compress": "^2.3.0", diff --git a/composer.lock b/composer.lock index bd99ddc4bc..2b24f523ab 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": "48a474d820347d3b3d88b04b32037736", + "content-hash": "2bff4f3d33880e0d517e09bc59a4f6de", "packages": [ { "name": "adldap2/adldap2", @@ -58,32 +58,36 @@ }, { "name": "bacon/bacon-qr-code", - "version": "1.0.3", + "version": "2.0.7", "source": { "type": "git", "url": "https://github.com/Bacon/BaconQrCode.git", - "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee" + "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/5a91b62b9d37cee635bbf8d553f4546057250bee", - "reference": "5a91b62b9d37cee635bbf8d553f4546057250bee", + "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/d70c840f68657ce49094b8d91f9ee0cc07fbf66c", + "reference": "d70c840f68657ce49094b8d91f9ee0cc07fbf66c", "shasum": "" }, "require": { + "dasprid/enum": "^1.0.3", "ext-iconv": "*", - "php": "^5.4|^7.0" + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^4.8" + "phly/keep-a-changelog": "^2.1", + "phpunit/phpunit": "^7 | ^8 | ^9", + "spatie/phpunit-snapshot-assertions": "^4.2.9", + "squizlabs/php_codesniffer": "^3.4" }, "suggest": { - "ext-gd": "to generate QR code images" + "ext-imagick": "to generate QR code images" }, "type": "library", "autoload": { - "psr-0": { - "BaconQrCode": "src/" + "psr-4": { + "BaconQrCode\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -94,13 +98,17 @@ { "name": "Ben Scholzen 'DASPRiD'", "email": "mail@dasprids.de", - "homepage": "http://www.dasprids.de", + "homepage": "https://dasprids.de/", "role": "Developer" } ], "description": "BaconQrCode is a QR code generator for PHP.", "homepage": "https://github.com/Bacon/BaconQrCode", - "time": "2017-10-17T09:59:25+00:00" + "support": { + "issues": "https://github.com/Bacon/BaconQrCode/issues", + "source": "https://github.com/Bacon/BaconQrCode/tree/2.0.7" + }, + "time": "2022-03-14T02:02:36+00:00" }, { "name": "bigbluebutton/bigbluebutton-api-php", @@ -669,6 +677,53 @@ "abandoned": "psr/container", "time": "2017-02-14T19:40:03+00:00" }, + { + "name": "dasprid/enum", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/DASPRiD/Enum.git", + "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/5abf82f213618696dda8e3bf6f64dd042d8542b2", + "reference": "5abf82f213618696dda8e3bf6f64dd042d8542b2", + "shasum": "" + }, + "require-dev": { + "phpunit/phpunit": "^7 | ^8 | ^9", + "squizlabs/php_codesniffer": "^3.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "DASPRiD\\Enum\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "Ben Scholzen 'DASPRiD'", + "email": "mail@dasprids.de", + "homepage": "https://dasprids.de/", + "role": "Developer" + } + ], + "description": "PHP 7.1 enum implementation", + "keywords": [ + "enum", + "map" + ], + "support": { + "issues": "https://github.com/DASPRiD/Enum/issues", + "source": "https://github.com/DASPRiD/Enum/tree/1.0.3" + }, + "time": "2020-10-02T16:03:48+00:00" + }, { "name": "defuse/php-encryption", "version": "v2.2.1", @@ -859,20 +914,20 @@ }, { "name": "egroupware/adodb-php", - "version": "dev-master", + "version": "5.20.4", "source": { "type": "git", "url": "https://github.com/EGroupware/ADOdb.git", - "reference": "94051ad29f81f656ff9cb4fc4f4e5a3e0200f4ef" + "reference": "d1f2e70dd2364280e19d4fce3aa2341166e37829" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/EGroupware/ADOdb/zipball/94051ad29f81f656ff9cb4fc4f4e5a3e0200f4ef", - "reference": "94051ad29f81f656ff9cb4fc4f4e5a3e0200f4ef", + "url": "https://api.github.com/repos/EGroupware/ADOdb/zipball/d1f2e70dd2364280e19d4fce3aa2341166e37829", + "reference": "d1f2e70dd2364280e19d4fce3aa2341166e37829", "shasum": "" }, "require": { - "php": "^5.3.2 || ^7.0" + "php": "^7.0 || ^8.0" }, "type": "library", "autoload": { @@ -909,7 +964,11 @@ "library", "php" ], - "time": "2021-10-07T08:18:43+00:00" + "support": { + "issues": "https://github.com/ADOdb/ADOdb/issues", + "source": "https://github.com/ADOdb/ADOdb" + }, + "time": "2022-04-20T19:24:47+00:00" }, { "name": "egroupware/bookmarks", @@ -4082,24 +4141,24 @@ }, { "name": "paragonie/constant_time_encoding", - "version": "v2.2.3", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "55af0dc01992b4d0da7f6372e2eac097bbbaffdb" + "reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/55af0dc01992b4d0da7f6372e2eac097bbbaffdb", - "reference": "55af0dc01992b4d0da7f6372e2eac097bbbaffdb", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/9229e15f2e6ba772f0c55dd6986c563b937170a8", + "reference": "9229e15f2e6ba772f0c55dd6986c563b937170a8", "shasum": "" }, "require": { - "php": "^7" + "php": "^7|^8" }, "require-dev": { - "phpunit/phpunit": "^6|^7", - "vimeo/psalm": "^1|^2" + "phpunit/phpunit": "^6|^7|^8|^9", + "vimeo/psalm": "^1|^2|^3|^4" }, "type": "library", "autoload": { @@ -4140,7 +4199,12 @@ "hex2bin", "rfc4648" ], - "time": "2019-01-03T20:26:31+00:00" + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/constant_time_encoding/issues", + "source": "https://github.com/paragonie/constant_time_encoding" + }, + "time": "2022-01-17T05:32:27+00:00" }, { "name": "paragonie/random_compat", @@ -5052,38 +5116,30 @@ }, { "name": "pragmarx/google2fa", - "version": "v5.0.0", + "version": "8.0.0", "source": { "type": "git", "url": "https://github.com/antonioribeiro/google2fa.git", - "reference": "17c969c82f427dd916afe4be50bafc6299aef1b4" + "reference": "26c4c5cf30a2844ba121760fd7301f8ad240100b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/17c969c82f427dd916afe4be50bafc6299aef1b4", - "reference": "17c969c82f427dd916afe4be50bafc6299aef1b4", + "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/26c4c5cf30a2844ba121760fd7301f8ad240100b", + "reference": "26c4c5cf30a2844ba121760fd7301f8ad240100b", "shasum": "" }, "require": { - "paragonie/constant_time_encoding": "~1.0|~2.0", - "paragonie/random_compat": ">=1", - "php": ">=5.4", - "symfony/polyfill-php56": "~1.2" + "paragonie/constant_time_encoding": "^1.0|^2.0", + "php": "^7.1|^8.0" }, "require-dev": { - "phpunit/phpunit": "~4|~5|~6" + "phpstan/phpstan": "^0.12.18", + "phpunit/phpunit": "^7.5.15|^8.5|^9.0" }, "type": "library", - "extra": { - "component": "package", - "branch-alias": { - "dev-master": "2.0-dev" - } - }, "autoload": { "psr-4": { - "PragmaRX\\Google2FA\\": "src/", - "PragmaRX\\Google2FA\\Tests\\": "tests/" + "PragmaRX\\Google2FA\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -5104,7 +5160,11 @@ "Two Factor Authentication", "google2fa" ], - "time": "2019-03-19T22:44:16+00:00" + "support": { + "issues": "https://github.com/antonioribeiro/google2fa/issues", + "source": "https://github.com/antonioribeiro/google2fa/tree/8.0.0" + }, + "time": "2020-04-05T10:47:18+00:00" }, { "name": "pragmarx/google2fa-qrcode", @@ -5162,6 +5222,10 @@ "qr code", "qrcode" ], + "support": { + "issues": "https://github.com/antonioribeiro/google2fa-qrcode/issues", + "source": "https://github.com/antonioribeiro/google2fa-qrcode/tree/master" + }, "time": "2019-03-20T16:42:58+00:00" }, { @@ -9005,74 +9069,6 @@ ], "time": "2021-11-30T18:21:41+00:00" }, - { - "name": "symfony/polyfill-php56", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", - "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "metapackage", - "extra": { - "branch-alias": { - "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php56/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-10-23T14:02:19+00:00" - }, { "name": "symfony/polyfill-php72", "version": "v1.25.0", @@ -12208,7 +12204,6 @@ "minimum-stability": "dev", "stability-flags": { "egroupware/activesync": 20, - "egroupware/adodb-php": 20, "egroupware/bookmarks": 20, "egroupware/collabora": 20, "egroupware/news_admin": 20, @@ -12224,7 +12219,7 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=7.3,<=8.0", + "php": ">=7.3,<=8.1", "ext-gd": "*", "ext-json": "*", "ext-mysqli": "*", @@ -12238,5 +12233,5 @@ "platform-overrides": { "php": "7.3" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" }