From 4480ac3dc3e6c943c16db538e1e484fdabfe84ac Mon Sep 17 00:00:00 2001 From: Brian Gilbert Date: Thu, 29 Jun 2023 15:20:57 +1000 Subject: [PATCH] update dependency versions to work with Drupal --- composer.json | 8 +- composer.lock | 317 ++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 246 insertions(+), 79 deletions(-) diff --git a/composer.json b/composer.json index e1d4919beb..235321d1d1 100644 --- a/composer.json +++ b/composer.json @@ -67,8 +67,8 @@ "simplesamlphp/assert": "^1.0.0", "simplesamlphp/saml2": "^5.0.0-alpha.6", "simplesamlphp/simplesamlphp-assets-base": "^2.0.0", - "simplesamlphp/simplesamlphp-module-adfs": "dev-master", - "symfony/cache": "^5.4||^6", + "simplesamlphp/simplesamlphp-module-adfs": "^3.0.0-rc1", + "symfony/cache": "v6.3.1", "symfony/config": "^5.4||^6", "symfony/console": "^6.2", "symfony/dependency-injection": "^5.4||^6", @@ -82,7 +82,7 @@ "symfony/routing": "^5.4||^6", "symfony/translation-contracts": "^2.5||^3", "symfony/twig-bridge": "^5.4||^6", - "symfony/var-exporter": "^5.4||^6", + "symfony/var-exporter": "^6.2.10", "symfony/yaml": "^5.4||^6", "twig/intl-extra": "^3.3", "twig/twig": "^3.3.8" @@ -113,7 +113,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "2.0.x-dev" } } } diff --git a/composer.lock b/composer.lock index bf21be3e91..ecaf6e8696 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": "c72271ad77289115424b3967b86b10b5", + "content-hash": "23d4712be996225362d7b7851f1a3a80", "packages": [ { "name": "gettext/gettext", @@ -840,16 +840,16 @@ }, { "name": "simplesamlphp/saml2", - "version": "v5.0.0-alpha.6", + "version": "v5.0.0-alpha.8", "source": { "type": "git", "url": "https://github.com/simplesamlphp/saml2.git", - "reference": "628c05a7245977bf37b5d8234d3fcce4ed88a2e2" + "reference": "a64a3dd8a6e495feb1fb98eeb69217a6ec939c03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/628c05a7245977bf37b5d8234d3fcce4ed88a2e2", - "reference": "628c05a7245977bf37b5d8234d3fcce4ed88a2e2", + "url": "https://api.github.com/repos/simplesamlphp/saml2/zipball/a64a3dd8a6e495feb1fb98eeb69217a6ec939c03", + "reference": "a64a3dd8a6e495feb1fb98eeb69217a6ec939c03", "shasum": "" }, "require": { @@ -899,9 +899,9 @@ "description": "SAML2 PHP library from SimpleSAMLphp", "support": { "issues": "https://github.com/simplesamlphp/saml2/issues", - "source": "https://github.com/simplesamlphp/saml2/tree/v5.0.0-alpha.6" + "source": "https://github.com/simplesamlphp/saml2/tree/v5.0.0-alpha.8" }, - "time": "2023-05-30T20:52:38+00:00" + "time": "2023-06-16T17:57:45+00:00" }, { "name": "simplesamlphp/simplesamlphp-assets-base", @@ -941,16 +941,16 @@ }, { "name": "simplesamlphp/simplesamlphp-module-adfs", - "version": "dev-master", + "version": "v3.0.0-rc1", "source": { "type": "git", "url": "https://github.com/simplesamlphp/simplesamlphp-module-adfs.git", - "reference": "15434fb952865d59296ad84c8ff1b4eed64501c8" + "reference": "0786afbd546b6a571d6023756d7ab52f863004a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-module-adfs/zipball/15434fb952865d59296ad84c8ff1b4eed64501c8", - "reference": "15434fb952865d59296ad84c8ff1b4eed64501c8", + "url": "https://api.github.com/repos/simplesamlphp/simplesamlphp-module-adfs/zipball/0786afbd546b6a571d6023756d7ab52f863004a3", + "reference": "0786afbd546b6a571d6023756d7ab52f863004a3", "shasum": "" }, "require": { @@ -958,15 +958,15 @@ "php": "^8.0", "robrichards/xmlseclibs": "^3.1.1", "simplesamlphp/assert": "^1.0.4", - "simplesamlphp/saml2": "^5.0.0-alpha.1", + "simplesamlphp/saml2": "^5.0.0-alpha.6", + "simplesamlphp/xml-common": "^1.12", "symfony/http-foundation": "^6.0" }, "require-dev": { - "simplesamlphp/simplesamlphp": "dev-symfony_responses", + "simplesamlphp/simplesamlphp": "dev-master", "simplesamlphp/simplesamlphp-test-framework": "^1.5.4", "simplesamlphp/xml-security": "^1.6.0" }, - "default-branch": true, "type": "simplesamlphp-module", "extra": { "branch-alias": { @@ -997,20 +997,20 @@ "issues": "https://github.com/simplesamlphp/simplesamlphp-module-adfs/issues", "source": "https://github.com/simplesamlphp/simplesamlphp-module-adfs" }, - "time": "2023-05-09T13:55:06+00:00" + "time": "2023-07-05T19:04:15+00:00" }, { "name": "simplesamlphp/xml-common", - "version": "v1.11.2", + "version": "v1.12.1", "source": { "type": "git", "url": "https://github.com/simplesamlphp/xml-common.git", - "reference": "38248c325d4defab95b271a461e2645370adca63" + "reference": "89a31ba1dd5bf5fe7573555e3d8238f9af66df5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplesamlphp/xml-common/zipball/38248c325d4defab95b271a461e2645370adca63", - "reference": "38248c325d4defab95b271a461e2645370adca63", + "url": "https://api.github.com/repos/simplesamlphp/xml-common/zipball/89a31ba1dd5bf5fe7573555e3d8238f9af66df5f", + "reference": "89a31ba1dd5bf5fe7573555e3d8238f9af66df5f", "shasum": "" }, "require": { @@ -1056,20 +1056,20 @@ "issues": "https://github.com/simplesamlphp/xml-common/issues", "source": "https://github.com/simplesamlphp/xml-common" }, - "time": "2023-05-29T16:54:53+00:00" + "time": "2023-06-04T21:46:50+00:00" }, { "name": "simplesamlphp/xml-security", - "version": "v1.6.5", + "version": "v1.6.9", "source": { "type": "git", "url": "https://github.com/simplesamlphp/xml-security.git", - "reference": "c3c3c9750dbbb982e18b014e79925d6d49cd5a87" + "reference": "b165928717c51edad19b16a99ac9c6df422ec8bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplesamlphp/xml-security/zipball/c3c3c9750dbbb982e18b014e79925d6d49cd5a87", - "reference": "c3c3c9750dbbb982e18b014e79925d6d49cd5a87", + "url": "https://api.github.com/repos/simplesamlphp/xml-security/zipball/b165928717c51edad19b16a99ac9c6df422ec8bc", + "reference": "b165928717c51edad19b16a99ac9c6df422ec8bc", "shasum": "" }, "require": { @@ -1081,7 +1081,7 @@ "ext-spl": "*", "php": "^8.0", "simplesamlphp/assert": "^1.0.4", - "simplesamlphp/xml-common": "^1.11.0" + "simplesamlphp/xml-common": "^1.11.5" }, "require-dev": { "simplesamlphp/simplesamlphp-test-framework": "^1.5.5" @@ -1118,22 +1118,22 @@ ], "support": { "issues": "https://github.com/simplesamlphp/xml-security/issues", - "source": "https://github.com/simplesamlphp/xml-security/tree/v1.6.5" + "source": "https://github.com/simplesamlphp/xml-security/tree/v1.6.9" }, - "time": "2023-05-28T18:49:00+00:00" + "time": "2023-06-03T20:50:34+00:00" }, { "name": "simplesamlphp/xml-soap", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/simplesamlphp/xml-soap.git", - "reference": "ac0d8c03a2f5eaa4d070b2074a80a1448579d7a5" + "reference": "a5eb5dff4d1aab8ebc0edc280da853615bd34a2e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplesamlphp/xml-soap/zipball/ac0d8c03a2f5eaa4d070b2074a80a1448579d7a5", - "reference": "ac0d8c03a2f5eaa4d070b2074a80a1448579d7a5", + "url": "https://api.github.com/repos/simplesamlphp/xml-soap/zipball/a5eb5dff4d1aab8ebc0edc280da853615bd34a2e", + "reference": "a5eb5dff4d1aab8ebc0edc280da853615bd34a2e", "shasum": "" }, "require": { @@ -1141,10 +1141,10 @@ "ext-pcre": "*", "php": "^8.0", "simplesamlphp/assert": "^1.0.4", - "simplesamlphp/xml-common": "^1.9.0" + "simplesamlphp/xml-common": "^1.11.0" }, "require-dev": { - "simplesamlphp/simplesamlphp-test-framework": "^1.5.4" + "simplesamlphp/simplesamlphp-test-framework": "^1.5.5" }, "type": "library", "extra": { @@ -1172,31 +1172,31 @@ "description": "SimpleSAMLphp library for XML SOAP", "support": { "issues": "https://github.com/simplesamlphp/xml-soap/issues", - "source": "https://github.com/simplesamlphp/xml-soap/tree/v1.2.0" + "source": "https://github.com/simplesamlphp/xml-soap/tree/v1.3.0" }, - "time": "2023-05-19T09:59:49+00:00" + "time": "2023-06-03T21:18:58+00:00" }, { "name": "symfony/cache", - "version": "v6.0.19", + "version": "v6.3.1", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "81ca309f056e836480928b20280ec52ce8369bb3" + "reference": "52cff7608ef6e38376ac11bd1fbb0a220107f066" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/81ca309f056e836480928b20280ec52ce8369bb3", - "reference": "81ca309f056e836480928b20280ec52ce8369bb3", + "url": "https://api.github.com/repos/symfony/cache/zipball/52cff7608ef6e38376ac11bd1fbb0a220107f066", + "reference": "52cff7608ef6e38376ac11bd1fbb0a220107f066", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "psr/cache": "^2.0|^3.0", "psr/log": "^1.1|^2|^3", - "symfony/cache-contracts": "^1.1.7|^2|^3", - "symfony/service-contracts": "^1.1|^2|^3", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/cache-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3", + "symfony/var-exporter": "^6.2.10" }, "conflict": { "doctrine/dbal": "<2.13.1", @@ -1212,7 +1212,7 @@ "require-dev": { "cache/integration-tests": "dev-master", "doctrine/dbal": "^2.13.1|^3.0", - "predis/predis": "^1.1", + "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "symfony/config": "^5.4|^6.0", "symfony/dependency-injection": "^5.4|^6.0", @@ -1226,6 +1226,9 @@ "psr-4": { "Symfony\\Component\\Cache\\": "" }, + "classmap": [ + "Traits/ValueWrapper.php" + ], "exclude-from-classmap": [ "/Tests/" ] @@ -1251,7 +1254,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.0.19" + "source": "https://github.com/symfony/cache/tree/v6.3.1" }, "funding": [ { @@ -1267,7 +1270,7 @@ "type": "tidelift" } ], - "time": "2023-01-20T17:44:14+00:00" + "time": "2023-06-24T11:51:27+00:00" }, { "name": "symfony/cache-contracts", @@ -1606,25 +1609,25 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.0.2", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -1653,7 +1656,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" }, "funding": [ { @@ -1669,7 +1672,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/error-handler", @@ -2178,25 +2181,30 @@ }, { "name": "symfony/http-foundation", - "version": "v6.0.20", + "version": "v6.3.1", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "e16b2676a4b3b1fa12378a20b29c364feda2a8d6" + "reference": "e0ad0d153e1c20069250986cd9e9dd1ccebb0d66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e16b2676a4b3b1fa12378a20b29c364feda2a8d6", - "reference": "e16b2676a4b3b1fa12378a20b29c364feda2a8d6", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/e0ad0d153e1c20069250986cd9e9dd1ccebb0d66", + "reference": "e0ad0d153e1c20069250986cd9e9dd1ccebb0d66", "shasum": "" }, "require": { - "php": ">=8.0.2", - "symfony/deprecation-contracts": "^2.1|^3", - "symfony/polyfill-mbstring": "~1.1" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php83": "^1.27" + }, + "conflict": { + "symfony/cache": "<6.2" }, "require-dev": { - "predis/predis": "~1.0", + "doctrine/dbal": "^2.13.1|^3.0", + "predis/predis": "^1.1|^2.0", "symfony/cache": "^5.4|^6.0", "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^5.4|^6.0", @@ -2204,9 +2212,6 @@ "symfony/mime": "^5.4|^6.0", "symfony/rate-limiter": "^5.2|^6.0" }, - "suggest": { - "symfony/mime": "To use the file extension guesser" - }, "type": "library", "autoload": { "psr-4": { @@ -2233,7 +2238,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.0.20" + "source": "https://github.com/symfony/http-foundation/tree/v6.3.1" }, "funding": [ { @@ -2249,7 +2254,7 @@ "type": "tidelift" } ], - "time": "2023-01-30T15:41:07+00:00" + "time": "2023-06-24T11:51:27+00:00" }, { "name": "symfony/http-kernel", @@ -2770,6 +2775,89 @@ ], "time": "2022-11-03T14:55:06+00:00" }, + { + "name": "symfony/polyfill-php80", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.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": "2022-11-03T14:55:06+00:00" + }, { "name": "symfony/polyfill-php81", "version": "v1.27.0", @@ -2849,6 +2937,83 @@ ], "time": "2022-11-03T14:55:06+00:00" }, + { + "name": "symfony/polyfill-php83", + "version": "v1.27.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php83.git", + "reference": "508c652ba3ccf69f8c97f251534f229791b52a57" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/508c652ba3ccf69f8c97f251534f229791b52a57", + "reference": "508c652ba3ccf69f8c97f251534f229791b52a57", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "symfony/polyfill-php80": "^1.14" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php83\\": "" + } + }, + "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 8.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php83/tree/v1.27.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": "2022-11-03T14:55:06+00:00" + }, { "name": "symfony/psr-http-message-bridge", "version": "v2.2.0", @@ -3480,20 +3645,20 @@ }, { "name": "symfony/var-exporter", - "version": "v6.0.19", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "df56f53818c2d5d9f683f4ad2e365ba73a3b69d2" + "reference": "db5416d04269f2827d8c54331ba4cfa42620d350" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/df56f53818c2d5d9f683f4ad2e365ba73a3b69d2", - "reference": "df56f53818c2d5d9f683f4ad2e365ba73a3b69d2", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/db5416d04269f2827d8c54331ba4cfa42620d350", + "reference": "db5416d04269f2827d8c54331ba4cfa42620d350", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=8.1" }, "require-dev": { "symfony/var-dumper": "^5.4|^6.0" @@ -3529,10 +3694,12 @@ "export", "hydrate", "instantiate", + "lazy-loading", + "proxy", "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.0.19" + "source": "https://github.com/symfony/var-exporter/tree/v6.3.0" }, "funding": [ { @@ -3548,7 +3715,7 @@ "type": "tidelift" } ], - "time": "2023-01-13T08:34:10+00:00" + "time": "2023-04-21T08:48:44+00:00" }, { "name": "symfony/yaml", @@ -5653,7 +5820,7 @@ "minimum-stability": "stable", "stability-flags": { "simplesamlphp/saml2": 15, - "simplesamlphp/simplesamlphp-module-adfs": 20 + "simplesamlphp/simplesamlphp-module-adfs": 5 }, "prefer-stable": false, "prefer-lowest": false,