Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include PHP 8.4 test coverage #600

Merged
merged 1 commit into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/php-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/Saml2/Auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Saml2/Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/Saml2/Utils.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading