Introduce php84 support #107

.github/workflows/unittests.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest']
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
     steps:
       - name: Set locales
         run: |

composer.json

@@ -30,7 +30,7 @@
         }
     ],
     "require": {
-        "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+        "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
         "ext-dom": "*",
         "ext-gettext": "*",
         "ext-simplexml": "*",

src/Context.php

@@ -401,7 +401,7 @@ private static function pathError(mixed $base, string $path, string $current, ?s
      *
      * @throws Exception\VariableNotFoundException
      */
-    public static function path(mixed $base, string $path, bool $nothrow = null): mixed
+    public static function path(mixed $base, string $path, bool $nothrow = false): mixed
     {
         if ($base === null) {
             if ($nothrow) {

src/Dom/Element.php

@@ -462,7 +462,7 @@ public function generateHead(CodeWriter $codewriter): void
         }
     }
 
-    public function generateContent(CodeWriter $codewriter, bool $realContent = null): void
+    public function generateContent(CodeWriter $codewriter, bool $realContent = false): void
     {
         if (!$this->isEmptyNode($codewriter->getOutputMode())) {
             if ($realContent || count($this->contentAttributes) === 0) {

src/Dom/SaxXmlParser.php

@@ -112,7 +112,7 @@ public function parseFile(DocumentBuilder $builder, string $src): DocumentBuilde
      * @throws ParserException
      * @throws TemplateException
      */
-    public function parseString(DocumentBuilder $builder, string $src, string $filename = null): DocumentBuilder
+    public function parseString(DocumentBuilder $builder, string $src, null|string $filename = null): DocumentBuilder
     {
         try {
             $builder->setEncoding($this->input_encoding);

src/PHPTAL.php

@@ -256,7 +256,7 @@ public function setTemplate(?string $path): PhpTalInterface
      *
      * @return $this
      */
-    public function setSource(string $src, ?string $path = null): PhpTalInterface
+    public function setSource(string $src, null|string $path = null): PhpTalInterface
     {
         $this->prepared = false;
         $this->functionName = null;

src/Php/CodeWriter.php

@@ -270,7 +270,7 @@ public function flushHtml(): void
      *
      * @param bool $called_from_macro for error checking: unbuffered output doesn't support that
      */
-    public function doDoctype(bool $called_from_macro = null): void
+    public function doDoctype(bool $called_from_macro = false): void
     {
         if ($this->doctype) {
             $code = '$ctx->setDocType(' . $this->str($this->doctype) .
@@ -284,7 +284,7 @@ public function doDoctype(bool $called_from_macro = null): void
      *
      * @param bool $called_from_macro for error checking: unbuffered output doesn't support that
      */
-    public function doXmlDeclaration(bool $called_from_macro = null): void
+    public function doXmlDeclaration(bool $called_from_macro = false): void
     {
         if ($this->xmldeclaration && $this->getOutputMode() !== PHPTAL::HTML5) {
             $code = '$ctx->setXmlDeclaration(' . $this->str($this->xmldeclaration) .
@@ -367,7 +367,7 @@ public function doForeach(string $out, string $source): void
     /**
      * @throws PhpTalException
      */
-    public function doEnd(string $expects = null): void
+    public function doEnd(null|string $expects = null): void
     {
         if (count($this->segments) === 0) {
             if ($expects === null) {

src/PhpTalInterface.php

@@ -28,11 +28,11 @@ public function setTemplate(string $path): self;
      * Use setTemplate() or addSourceResolver() whenever possible.
      *
      * @param string $src The phptal template source.
-     * @param string $path Fake and 'unique' template path.
+     * @param null|string $path Fake and 'unique' template path.
      *
      * @return $this
      */
-    public function setSource(string $src, string $path = null): self;
+    public function setSource(string $src, null|string $path = null): self;
 
     /**
      * Specify where to look for templates.

tests/ReadableErrorTest.php

@@ -88,7 +88,7 @@ public function testLocalMacroNotExists(): void
         $this->assertThrowsInLine(5, 'input/error-13.html');
     }
 
-    public function assertThrowsInLine(int $line, string $file, string $expected_file = null): void
+    public function assertThrowsInLine(int $line, string $file, null|string $expected_file = null): void
     {
         $tpl = null;
         try {

tests/Testhelper/CountableImpl.php

@@ -24,7 +24,7 @@ class CountableImpl implements Countable
 {
     private readonly int $cnt;
 
-    public function __construct(int $cnt = null)
+    public function __construct(null|int $cnt = null)
     {
         $this->cnt = $cnt ?? 0;
     }