diff --git a/composer.json b/composer.json index a10aaf9097..0b414244b6 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,7 @@ "gettext/gettext": "~5.7", "gettext/php-scanner": "^2.0", "gettext/translator": "~1.2", - "phpmailer/phpmailer": "~6.10 || ~7.0", + "phpmailer/phpmailer": "~7.0", "psr/event-dispatcher": "~1.0", "psr/log": "~3.0", "robrichards/xmlseclibs": "^3.1.5", @@ -137,7 +137,8 @@ "extra": { "branch-alias": { "dev-master": "2.5.x-dev", - "dev-simplesamlphp-2.5": "2.5.x-dev" + "dev-simplesamlphp-2.5": "2.5.x-dev", + "dev-simplesamlphp-2.6": "2.6.x-dev" } }, "scripts": { diff --git a/composer.lock b/composer.lock index 6993dc45eb..ff660fa516 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": "dd74def800ca59ced894e5550a73997c", + "content-hash": "524fcf86612a9827697ab6c6622b944d", "packages": [ { "name": "gettext/gettext", @@ -3234,7 +3234,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.35.0", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -3293,7 +3293,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.35.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.36.0" }, "funding": [ { @@ -3317,7 +3317,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.35.0", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -3375,7 +3375,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.35.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.36.0" }, "funding": [ { @@ -3399,7 +3399,7 @@ }, { "name": "symfony/polyfill-intl-icu", - "version": "v1.35.0", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-icu.git", @@ -3463,7 +3463,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.35.0" + "source": "https://github.com/symfony/polyfill-intl-icu/tree/v1.36.0" }, "funding": [ { @@ -3487,7 +3487,7 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.35.0", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -3548,7 +3548,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.35.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.36.0" }, "funding": [ { @@ -3572,7 +3572,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.35.0", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -3633,7 +3633,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.35.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.36.0" }, "funding": [ { @@ -3657,7 +3657,7 @@ }, { "name": "symfony/polyfill-php83", - "version": "v1.35.0", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", @@ -3713,7 +3713,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.35.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.36.0" }, "funding": [ { @@ -3737,7 +3737,7 @@ }, { "name": "symfony/polyfill-php85", - "version": "v1.35.0", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php85.git", @@ -3793,7 +3793,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php85/tree/v1.35.0" + "source": "https://github.com/symfony/polyfill-php85/tree/v1.36.0" }, "funding": [ { @@ -5692,11 +5692,11 @@ }, { "name": "phpstan/phpstan", - "version": "2.1.47", + "version": "2.1.48", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/79015445d8bd79e62b29140f12e5bfced1dcca65", - "reference": "79015445d8bd79e62b29140f12e5bfced1dcca65", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/231397213efb7c0a066ee024b5c3c87f2d3adfa0", + "reference": "231397213efb7c0a066ee024b5c3c87f2d3adfa0", "shasum": "" }, "require": { @@ -5741,7 +5741,7 @@ "type": "github" } ], - "time": "2026-04-13T15:49:08+00:00" + "time": "2026-04-15T20:24:19+00:00" }, { "name": "phpstan/phpstan-mockery", @@ -6195,16 +6195,16 @@ }, { "name": "phpunit/phpunit", - "version": "12.5.20", + "version": "12.5.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "c2364520611caa03567a8a020f2d59f3f90b115a" + "reference": "1b7bd4788966bf1533901808657850b6c7876ec7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c2364520611caa03567a8a020f2d59f3f90b115a", - "reference": "c2364520611caa03567a8a020f2d59f3f90b115a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1b7bd4788966bf1533901808657850b6c7876ec7", + "reference": "1b7bd4788966bf1533901808657850b6c7876ec7", "shasum": "" }, "require": { @@ -6218,7 +6218,7 @@ "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.3", - "phpunit/php-code-coverage": "^12.5.5", + "phpunit/php-code-coverage": "^12.5.6", "phpunit/php-file-iterator": "^6.0.1", "phpunit/php-invoker": "^6.0.0", "phpunit/php-text-template": "^5.0.0", @@ -6226,7 +6226,7 @@ "sebastian/cli-parser": "^4.2.0", "sebastian/comparator": "^7.1.6", "sebastian/diff": "^7.0.0", - "sebastian/environment": "^8.0.4", + "sebastian/environment": "^8.1.0", "sebastian/exporter": "^7.0.2", "sebastian/global-state": "^8.0.2", "sebastian/object-enumerator": "^7.0.0", @@ -6273,7 +6273,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.20" + "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.21" }, "funding": [ { @@ -6281,7 +6281,7 @@ "type": "other" } ], - "time": "2026-04-15T05:05:59+00:00" + "time": "2026-04-16T04:56:04+00:00" }, { "name": "predis/predis", @@ -7584,7 +7584,7 @@ }, { "name": "symfony/polyfill-php84", - "version": "v1.35.0", + "version": "v1.36.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php84.git", @@ -7640,7 +7640,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php84/tree/v1.35.0" + "source": "https://github.com/symfony/polyfill-php84/tree/v1.36.0" }, "funding": [ { diff --git a/extra/simplesamlphp.spec b/extra/simplesamlphp.spec index 470a87b9a0..8469a2100d 100644 --- a/extra/simplesamlphp.spec +++ b/extra/simplesamlphp.spec @@ -1,6 +1,6 @@ %define name simplesamlphp %define summary SAML IDP/SP written in PHP -%define version 2.5.0 +%define version 2.6.0 %define release 1 %define license LGPL 2.1 %define group Networking/WWW