Init php8.1 compatibility

This marks the start of the php 8.1 compatbility work. We'll have a new
major version after the compat-work and refactorings are done within the
source, so the <php8.1 support will continue in the 3.x branch

.github/workflows/unittests.yml

@@ -13,7 +13,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest']
-        php-versions: [7.3, 7.4, 8.0]
+        php-versions: [8.1]
     steps:
       - name: Set locales
         run: |

README.md

@@ -8,10 +8,18 @@
 Requirements
 ============
 
-To use PHPTAL in your projects, you will require PHP 7.3 or later.
+See the compatibility table below for supported php versions.
 
 If you want to use the builtin internationalisation system (I18N), the php-gettext extension must be installed or compiled into PHP (`--with-gettext`).
 
+Compatibility
+=============
+
+| PHPTAL-Version | PHP-Version(s) |
+|----------------|----------------|
+| 3.x            | 7.3, 7.4, 8.0  |
+| master         | 8.1            |
+
 Composer install (recommended)
 ==============================
 

composer.json

@@ -33,7 +33,7 @@
         "ext-dom": "*",
         "ext-gettext": "*",
         "ext-simplexml": "*",
-        "php": "^7.3||^8.0",
+        "php": "^8.1",
         "symfony/polyfill-mbstring": "^1.12"
     },
     "require-dev": {
@@ -55,7 +55,7 @@
     },
     "config": {
         "platform": {
-            "php": "7.3"
+            "php": "8.1"
         },
         "bin-dir": "bin",
         "sort-packages": true

src/RepeatController.php

@@ -133,7 +133,7 @@ public function __construct($source)
      *
      * @return Mixed    The current element value
      */
-    public function current()
+    public function current(): mixed
     {
         return $this->current;
     }
@@ -143,8 +143,7 @@ public function current()
      *
      * @return String/Int   The current element key
      */
-    public function key()
-    {
+    public function key(): mixed {
         return $this->key;
     }
 

tests/Testhelper/LogIteratorCalls.php

@@ -42,31 +42,31 @@ public function __construct($arr)
         }
     }
 
-    public function current()
+    public function current(): mixed
     {
         $this->log .= "current\n";
         return $this->i->current();
     }
 
-    public function next()
+    public function next(): void
     {
         $this->log .= "next\n";
-        return $this->i->next();
+        $this->i->next();
     }
 
-    public function key()
+    public function key(): mixed
     {
         $this->log .= "key\n";
         return $this->i->key();
     }
 
-    public function rewind()
+    public function rewind(): void
     {
         $this->log .= "rewind\n";
-        return $this->i->rewind();
+        $this->i->rewind();
     }
 
-    public function valid()
+    public function valid(): bool
     {
         $this->log .= "valid\n";
         return $this->i->valid();

tests/Testhelper/MyArray.php

@@ -40,10 +40,8 @@ public function push($value): void
 
     /**
      * @param string $index
-     *
-     * @return mixed
      */
-    public function offsetGet($index)
+    public function offsetGet($index): mixed
     {
         return $this->values[$index];
     }

tests/Testhelper/MyIterable.php

@@ -63,10 +63,9 @@ public function key(): int
     /**
      * @return int
      */
-    public function next(): int
+    public function next(): void
     {
         $this->index++;
-        return $this->index;
     }
 
     /**

tests/Testhelper/MyIterableThrowsOnSize.php

@@ -25,7 +25,7 @@ class MyIterableThrowsOnSize extends MyIterable implements Countable
     /**
      * @throws SizeCalledException
      */
-    public function count()
+    public function count(): int
     {
         throw new SizeCalledException('count() called');
     }