Add php84 support and perform upstream update

.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": "*",

doc/en/book.xml

@@ -1383,6 +1383,18 @@ this page has been readed ${page/countRead} times"/>
               <code>NE</code> (not equal)          
             </para>
           </listitem>
+          <listitem>
+            <para>
+              <code>!==</code> :
+              <code>EQQ</code> (strictly equal)
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <code>===</code> :
+              <code>NEE</code> (strictly not equal)
+            </para>
+          </listitem>
           <listitem>
             <para>
               <code>&amp;&amp;</code> : 

rector.php

@@ -2,10 +2,8 @@
 
 declare(strict_types=1);
 
-use Rector\CodeQuality\Rector\FuncCall\IntvalToTypeCastRector;
 use Rector\Config\RectorConfig;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
-use Rector\Php73\Rector\FuncCall\JsonThrowOnErrorRector;
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
 use Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector;
 use Rector\Php80\Rector\FunctionLike\MixedTypeRector;
@@ -19,14 +17,12 @@
     ->withImportNames()
     ->withSkip([
         StringClassNameToClassConstantRector::class,
-        JsonThrowOnErrorRector::class,
         FirstClassCallableRector::class,
         MixedTypeRector::class,
     ])
     ->withPhpSets(php81: true)
     ->withPreparedSets(deadCode: true)
     ->withRules([
-        IntvalToTypeCastRector::class,
         AddLiteralSeparatorToNumberRector::class,
         ClosureToArrowFunctionRector::class,
     ]);

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/Dom/XmlnsState.php

@@ -31,7 +31,7 @@ class XmlnsState
     /** Create a new XMLNS state inheriting provided aliases.
      * @param array<string, string> $prefix_to_uri
      */
-    public function __construct(private array $prefix_to_uri, private string $current_default)
+    public function __construct(private array $prefix_to_uri, private readonly string $current_default)
     {
     }
 

src/NothingKeyword.php

@@ -30,9 +30,6 @@ public function count(): int
     {
         return 0;
     }
-    /**
-     * @return null
-     */
     public function jsonSerialize(): ?string
     {
         return null;

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

@@ -179,7 +179,7 @@ public function splitExpression(string $src): array
         preg_match_all('/(?:[^;]+|;;)+/sm', $src, $array);
         $array = $array[0];
         foreach ($array as &$a) {
-            $a = str_replace(';;', ';', (string) $a);
+            $a = str_replace(';;', ';', $a);
         }
         return $array;
     }
@@ -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/Php/Transformer.php

@@ -55,13 +55,15 @@ class Transformer
     private static array $TranslationTable = [
         'not' => '!',
         'ne' => '!=',
+        'nee' => '!==',
         'and' => '&&',
         'or' => '||',
         'lt' => '<',
         'gt' => '>',
         'ge' => '>=',
         'le' => '<=',
         'eq' => '==',
+        'eqq' => '===',
     ];
 
     /**

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/PhpModeTestTestCase.php → tests/PhpModeTest.php

@@ -22,7 +22,7 @@
 use Tests\Testcase\PhpTalTestCase;
 use Tests\Testhelper\Helper;
 
-class PhpModeTestTestCase extends PhpTalTestCase
+class PhpModeTest extends PhpTalTestCase
 {
     public function tearDown(): void
     {