From 6264c88f25dc8f314f1ac461041ca078c66266ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Wed, 4 Sep 2024 09:14:59 +0200 Subject: [PATCH 1/2] Add PHP 8.3 and 8.4 to test matrix --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ee763841..6f07983d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -24,6 +24,10 @@ jobs: phpunit: '9' - php: '8.2' phpunit: '9' + - php: '8.3' + phpunit: '9' + - php: '8.4' + phpunit: '9' steps: - uses: actions/checkout@v2 - uses: php-actions/composer@v6 From 77309b6a7f304a5f9e351bc52d8adc831989734f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Anne?= Date: Wed, 4 Sep 2024 09:15:38 +0200 Subject: [PATCH 2/2] Fix `Implicitly marking parameter $param as nullable is deprecated` --- source/CAS.php | 8 ++++---- source/CAS/Client.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/CAS.php b/source/CAS.php index df6bc825..bf75c551 100644 --- a/source/CAS.php +++ b/source/CAS.php @@ -338,7 +338,7 @@ class phpCAS * @param bool $changeSessionID Allow phpCAS to change the session_id * (Single Sign Out/handleLogoutRequests * is based on that change) - * @param \SessionHandlerInterface $sessionHandler the session handler + * @param \SessionHandlerInterface|null $sessionHandler the session handler * * @return void a newly created CAS_Client object * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be @@ -347,7 +347,7 @@ class phpCAS */ public static function client($server_version, $server_hostname, $server_port, $server_uri, $service_base_url, - $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null + $changeSessionID = true, ?\SessionHandlerInterface $sessionHandler = null ) { phpCAS :: traceBegin(); if (is_object(self::$_PHPCAS_CLIENT)) { @@ -393,7 +393,7 @@ public static function client($server_version, $server_hostname, * @param bool $changeSessionID Allow phpCAS to change the session_id * (Single Sign Out/handleLogoutRequests * is based on that change) - * @param \SessionHandlerInterface $sessionHandler the session handler + * @param \SessionHandlerInterface|null $sessionHandler the session handler * * @return void a newly created CAS_Client object * @note Only one of the phpCAS::client() and phpCAS::proxy functions should be @@ -402,7 +402,7 @@ public static function client($server_version, $server_hostname, */ public static function proxy($server_version, $server_hostname, $server_port, $server_uri, $service_base_url, - $changeSessionID = true, \SessionHandlerInterface $sessionHandler = null + $changeSessionID = true, ?\SessionHandlerInterface $sessionHandler = null ) { phpCAS :: traceBegin(); if (is_object(self::$_PHPCAS_CLIENT)) { diff --git a/source/CAS/Client.php b/source/CAS/Client.php index 8ca9711f..294eda44 100644 --- a/source/CAS/Client.php +++ b/source/CAS/Client.php @@ -926,7 +926,7 @@ public function getAuthenticationCallerMethod () * CAS_ServiceBaseUrl_Interface for custom * behavior. Added in 1.6.0. Similar to * serverName config in other CAS clients. - * @param \SessionHandlerInterface $sessionHandler the session handler + * @param \SessionHandlerInterface|null $sessionHandler the session handler * * @return self a newly created CAS_Client object */ @@ -938,7 +938,7 @@ public function __construct( $server_uri, $service_base_url, $changeSessionID = true, - \SessionHandlerInterface $sessionHandler = null + ?\SessionHandlerInterface $sessionHandler = null ) { // Argument validation if (gettype($server_version) != 'string')