Add PHP 8.4 support, drop PHP 8.1

phptal · Sep 24, 2024 · 2df0615 · 2df0615
1 parent 9d0a1eb
commit 2df0615
Show file tree

Hide file tree

Showing 4 changed files with 279 additions and 260 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -17,9 +17,9 @@ jobs:
           - "highest"
           - "locked"
         php-version:
-          - "8.1"
           - "8.2"
           - "8.3"
+          - "8.4"
         operating-system:
           - "ubuntu-latest"
 
@@ -36,7 +36,7 @@ jobs:
           tools: composer:v2, cs2pr
 
       - name: "Cache dependencies"
-        uses: "actions/cache@v3"
+        uses: "actions/cache@v4"
         with:
           path: |
             ~/.composer/cache

diff --git a/classes/PHPTAL/Dom/Element.php b/classes/PHPTAL/Dom/Element.php
@@ -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)) {

diff --git a/composer.json b/composer.json
@@ -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": {