From be1696884080d3fed9ee95b110b033ed796769fa Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Mon, 19 Dec 2022 21:36:23 +0100 Subject: [PATCH 1/2] Allow `lcobucci/clock:^3.0` to be installed with `lcobucci/jwt:^4` --- composer.json | 2 +- composer.lock | 98 +++++++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/composer.json b/composer.json index dd3b2d7d..6c53e4c3 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "ext-mbstring": "*", "ext-openssl": "*", "ext-sodium": "*", - "lcobucci/clock": "^2.0" + "lcobucci/clock": "^2.0 || ^3.0" }, "require-dev": { "infection/infection": "^0.21", diff --git a/composer.lock b/composer.lock index a0ed4795..da17c1fd 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": "22fe9a62505921a50cddf66b788a67aa", + "content-hash": "22de66f8a38ac3f7a0590a76c72e97b8", "packages": [ { "name": "lcobucci/clock", @@ -951,12 +951,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "DeepCopy\\": "src/DeepCopy/" - }, "files": [ "src/DeepCopy/deep_copy.php" - ] + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2398,11 +2398,11 @@ } }, "autoload": { - "classmap": [ - "src/" - ], "files": [ "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2614,12 +2614,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Later\\": "src/" - }, "files": [ "src/functions.php" - ] + ], + "psr-4": { + "Later\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -2679,12 +2679,12 @@ } }, "autoload": { - "psr-4": { - "Pipeline\\": "src/" - }, "files": [ "src/functions.php" - ] + ], + "psr-4": { + "Pipeline\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4249,12 +4249,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4328,12 +4328,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Grapheme\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4409,12 +4409,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -4496,12 +4496,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -4573,12 +4573,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -4652,12 +4652,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" - }, "files": [ "bootstrap.php" ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, "classmap": [ "Resources/stubs" ] @@ -4885,12 +4885,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Symfony\\Component\\String\\": "" - }, "files": [ "Resources/functions.php" ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, "exclude-from-classmap": [ "/Tests/" ] @@ -4967,13 +4967,6 @@ } }, "autoload": { - "psr-4": { - "Safe\\": [ - "lib/", - "deprecated/", - "generated/" - ] - }, "files": [ "deprecated/apc.php", "deprecated/libevent.php", @@ -5064,7 +5057,14 @@ "generated/yaz.php", "generated/zip.php", "generated/zlib.php" - ] + ], + "psr-4": { + "Safe\\": [ + "lib/", + "deprecated/", + "generated/" + ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -5251,5 +5251,5 @@ "ext-sodium": "*" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } From d15f46049267d20eeee5262ce3b3c33bc2c01ee7 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Mon, 2 Jan 2023 13:55:21 +0100 Subject: [PATCH 2/2] Pinpoint a `composer-normalize` version that supports PHP 7.4 --- .github/workflows/composer-json-lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/composer-json-lint.yml b/.github/workflows/composer-json-lint.yml index 28a73a62..cf92913f 100644 --- a/.github/workflows/composer-json-lint.yml +++ b/.github/workflows/composer-json-lint.yml @@ -29,7 +29,7 @@ jobs: coverage: "none" php-version: "${{ matrix.php-version }}" ini-values: memory_limit=-1 - tools: composer:v2, composer-normalize, composer-require-checker, composer-unused + tools: composer:v2, composer-normalize:2.28.3, composer-require-checker, composer-unused - name: Get composer cache directory id: composer-cache