diff --git a/.patches/php-saml-600.patch b/.patches/php-saml-600.patch deleted file mode 100644 index 2ebe1e098..000000000 --- a/.patches/php-saml-600.patch +++ /dev/null @@ -1,81 +0,0 @@ -SPDX-FileCopyrightText: 2024 Nextcloud GmbH -SPDX-License-Identifier: MIT -From 3628572e9916f747a450484c35c51a5164b00c54 Mon Sep 17 00:00:00 2001 -From: Arthur Schiwon -Date: Fri, 8 Nov 2024 18:05:46 +0100 -Subject: [PATCH] Include PHP 8.4 test coverage - -- also fixes deprecations on implicit null - -Signed-off-by: Arthur Schiwon ---- - .github/workflows/php-package.yml | 6 +++--- - src/Saml2/Auth.php | 2 +- - src/Saml2/Settings.php | 2 +- - src/Saml2/Utils.php | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/.github/workflows/php-package.yml b/.github/workflows/php-package.yml -index 7840700a..6321b7ef 100644 ---- a/.github/workflows/php-package.yml -+++ b/.github/workflows/php-package.yml -@@ -16,7 +16,7 @@ jobs: - fail-fast: false - matrix: - operating-system: ['ubuntu-latest'] -- php-versions: [7.3, 7.4, 8.0, 8.1, 8.2, 8.3] -+ php-versions: [7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4] - steps: - - name: Setup PHP, with composer and extensions - uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php -@@ -46,9 +46,9 @@ jobs: - php vendor/bin/phploc src/. - mkdir -p tests/build/dependences - php vendor/bin/pdepend --summary-xml=tests/build/logs/dependence-summary.xml --jdepend-chart=tests/build/dependences/jdepend.svg --overview-pyramid=tests/build/dependences/pyramid.svg src/. -- -+ - - name: PHP Code Sniffer - run: php vendor/bin/phpcs --standard=tests/ZendModStandard src/Saml2 demo1 demo2 endpoints tests/src -- -+ - - name: Run unit tests - run: vendor/bin/phpunit --verbose --debug -diff --git a/src/Saml2/Auth.php b/src/Saml2/Auth.php -index 35037031..a860b358 100644 ---- a/src/Saml2/Auth.php -+++ b/src/Saml2/Auth.php -@@ -171,7 +171,7 @@ class Auth - * @throws Exception - * @throws Error - */ -- public function __construct(array $settings = null, bool $spValidationOnly = false) -+ public function __construct(?array $settings = null, bool $spValidationOnly = false) - { - $this->_settings = new Settings($settings, $spValidationOnly); - } -diff --git a/src/Saml2/Settings.php b/src/Saml2/Settings.php -index 0ca095a9..c750608e 100644 ---- a/src/Saml2/Settings.php -+++ b/src/Saml2/Settings.php -@@ -120,7 +120,7 @@ class Settings - * @throws Error If any settings parameter is invalid - * @throws Exception If Settings is incorrectly supplied - */ -- public function __construct(array $settings = null,bool $spValidationOnly = false) -+ public function __construct(?array $settings = null,bool $spValidationOnly = false) - { - $this->_spValidationOnly = $spValidationOnly; - $this->_loadPaths(); -diff --git a/src/Saml2/Utils.php b/src/Saml2/Utils.php -index eea057ff..5742a063 100644 ---- a/src/Saml2/Utils.php -+++ b/src/Saml2/Utils.php -@@ -954,7 +954,7 @@ public static function getExpireTime($cacheDuration = null, $validUntil = null) - * - * @return DOMNodeList The queried nodes - */ -- public static function query(DOMDocument $dom, $query, DOMElement $context = null) -+ public static function query(DOMDocument $dom, $query, ?DOMElement $context = null) - { - $xpath = new DOMXPath($dom); - $xpath->registerNamespace('samlp', Constants::NS_SAMLP); diff --git a/composer.json b/composer.json index 9729c03ac..db31c35be 100644 --- a/composer.json +++ b/composer.json @@ -7,16 +7,10 @@ "php": "8.1.32" }, "allow-plugins": { - "cweagans/composer-patches": true, "bamarni/composer-bin-plugin": true } }, "extra": { - "patches": { - "onelogin/php-saml": { - "PHP 8.4 compatibility": ".patches/php-saml-600.patch" - } - }, "bamarni-bin": { "bin-links": true, "forward-command": true @@ -45,7 +39,6 @@ }, "require": { "onelogin/php-saml": "^4.2", - "firebase/php-jwt": "^6.11", - "cweagans/composer-patches": "^1.7" + "firebase/php-jwt": "^6.11" } } diff --git a/composer.lock b/composer.lock index 3d5d494e2..ffaa20756 100644 --- a/composer.lock +++ b/composer.lock @@ -4,56 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "45cd7794b245c1413c81f5f5e244c09f", + "content-hash": "5d8b01e562ca288f5e1d17278a4b309b", "packages": [ - { - "name": "cweagans/composer-patches", - "version": "1.7.3", - "source": { - "type": "git", - "url": "https://github.com/cweagans/composer-patches.git", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/e190d4466fe2b103a55467dfa83fc2fecfcaf2db", - "reference": "e190d4466fe2b103a55467dfa83fc2fecfcaf2db", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^1.0 || ^2.0", - "php": ">=5.3.0" - }, - "require-dev": { - "composer/composer": "~1.0 || ~2.0", - "phpunit/phpunit": "~4.6" - }, - "type": "composer-plugin", - "extra": { - "class": "cweagans\\Composer\\Patches" - }, - "autoload": { - "psr-4": { - "cweagans\\Composer\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Cameron Eagans", - "email": "me@cweagans.net" - } - ], - "description": "Provides a way to patch Composer packages.", - "support": { - "issues": "https://github.com/cweagans/composer-patches/issues", - "source": "https://github.com/cweagans/composer-patches/tree/1.7.3" - }, - "time": "2022-12-20T22:53:13+00:00" - }, { "name": "firebase/php-jwt", "version": "v6.11.1", @@ -119,16 +71,16 @@ }, { "name": "onelogin/php-saml", - "version": "4.2.0", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/SAML-Toolkits/php-saml.git", - "reference": "d3b5172f137db2f412239432d77253ceaaa1e939" + "reference": "bf5efce9f2df5d489d05e78c27003a0fc8bc50f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SAML-Toolkits/php-saml/zipball/d3b5172f137db2f412239432d77253ceaaa1e939", - "reference": "d3b5172f137db2f412239432d77253ceaaa1e939", + "url": "https://api.github.com/repos/SAML-Toolkits/php-saml/zipball/bf5efce9f2df5d489d05e78c27003a0fc8bc50f0", + "reference": "bf5efce9f2df5d489d05e78c27003a0fc8bc50f0", "shasum": "" }, "require": { @@ -179,7 +131,7 @@ "type": "github" } ], - "time": "2024-05-30T15:10:40+00:00" + "time": "2025-05-25T14:28:00+00:00" }, { "name": "robrichards/xmlseclibs",