Skip to content

Commit

Permalink
Merge pull request #110 from lolli42/lolli-1
Browse files Browse the repository at this point in the history
Support PHP 8.4
  • Loading branch information
darylldoyle authored Sep 5, 2024
2 parents bcd646a + 7dd11e4 commit 068d9fc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/codeclimate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:

strategy:
matrix:
php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3']
php: ['7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3', '8.4']
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"require": {
"ext-dom": "*",
"ext-libxml": "*",
"php": "^5.6 || ^7.0 || ^8.0"
"php": "^7.1 || ^8.0"
},
"require-dev": {
"phpunit/phpunit": "^5.7 || ^6.5 || ^8.5"
"phpunit/phpunit": "^6.5 || ^8.5"
}
}
2 changes: 1 addition & 1 deletion src/Exceptions/NestingException.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class NestingException extends \Exception
* @param Exception|null $previous
* @param \DOMElement|null $element
*/
public function __construct($message = "", $code = 0, Exception $previous = null, \DOMElement $element = null)
public function __construct($message = "", $code = 0, ?Exception $previous = null, ?\DOMElement $element = null)
{
$this->element = $element;
parent::__construct($message, $code, $previous);
Expand Down

0 comments on commit 068d9fc

Please sign in to comment.