Skip to content

Commit

Permalink
Merge pull request #97 from Slamdunk/php_84
Browse files Browse the repository at this point in the history
Add PHP 8.4 support, drop PHP 8.1
  • Loading branch information
Ocramius authored Sep 24, 2024
2 parents 9d0a1eb + 2df0615 commit 83359df
Show file tree
Hide file tree
Showing 4 changed files with 279 additions and 260 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
- "highest"
- "locked"
php-version:
- "8.1"
- "8.2"
- "8.3"
- "8.4"
operating-system:
- "ubuntu-latest"

Expand All @@ -36,7 +36,7 @@ jobs:
tools: composer:v2, cs2pr

- name: "Cache dependencies"
uses: "actions/cache@v3"
uses: "actions/cache@v4"
with:
path: |
~/.composer/cache
Expand Down
2 changes: 1 addition & 1 deletion classes/PHPTAL/Dom/Element.php
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ public function generateHead(PHPTAL_Php_CodeWriter $codewriter)
}
}

public function generateContent(PHPTAL_Php_CodeWriter $codewriter = null, $realContent=false)
public function generateContent(?PHPTAL_Php_CodeWriter $codewriter = null, $realContent=false)
{
if (!$this->isEmptyNode($codewriter->getOutputMode())) {
if ($realContent || !count($this->contentAttributes)) {
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
],
"homepage": "https://phptal.org/",
"require": {
"php": "~8.1.0 || ~8.2.0 || ~8.3.0"
"php": "~8.2.0 || ~8.3.0 || ~8.4.0"
},
"require-dev": {
"phpunit/phpunit": "^10.4.1"
"phpunit/phpunit": "^11.3.6"
},
"autoload": {
"psr-0": {
Expand Down
Loading

0 comments on commit 83359df

Please sign in to comment.