Merge pull request #89 from Slamdunk/php_81

Add PHP 8.1 support, drop PHP 7.3

Author: Ocramius

.github/workflows/phpunit.yml

@@ -17,9 +17,9 @@ jobs:
           - "highest"
           - "locked"
         php-version:
-          - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
         operating-system:
           - "ubuntu-latest"
 

.gitignore

@@ -2,3 +2,4 @@ build
 /vendor/
 /doc/temp/
 /docs/
+.phpunit.result.cache

classes/PHPTAL.php

@@ -981,7 +981,7 @@ public function getFunctionName()
        if (!$this->_functionName) {
 
             // just to make tempalte name recognizable
-            $basename = preg_replace('/\.[a-z]{3,5}$/', '', basename($this->_source->getRealPath()));
+            $basename = preg_replace('/\.[a-z]{3,5}$/', '', basename($this->_source->getRealPath() ?? ''));
             $basename = substr(trim(preg_replace('/[^a-zA-Z0-9]+/', '_', $basename), "_"), 0, 20);
 
             $hash = md5(PHPTAL_VERSION . PHP_VERSION

classes/PHPTAL/DefaultKeyword.php

@@ -26,11 +26,13 @@ public function __toString()
         return "''";
     }
 
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return 1;
     }
 
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return new stdClass;

classes/PHPTAL/Dom/SaxXmlParser.php

@@ -370,7 +370,7 @@ private function checkEncoding($str)
             // $match expression below somehow triggers quite deep recurrency and stack overflow in preg
             // to avoid this, check string bit by bit, omitting ASCII fragments.
             if (strlen($str) > 200) {
-                $chunks = preg_split('/(?>[\x09\x0A\x0D\x20-\x7F]+)/',$str,null,PREG_SPLIT_NO_EMPTY);
+                $chunks = preg_split('/(?>[\x09\x0A\x0D\x20-\x7F]+)/',$str,0,PREG_SPLIT_NO_EMPTY);
                 foreach ($chunks as $chunk) {
                     if (strlen($chunk) < 200) {
                         $this->checkEncoding($chunk);
@@ -392,7 +392,7 @@ private function checkEncoding($str)
                . '|\xF4[\x80-\x8F][\x80-\xBF]{2}';    // plane 16
 
             if (!preg_match('/^(?:(?>'.$match.'))+$/s',$str)) {
-                $res = preg_split('/((?>'.$match.')+)/s',$str,null,PREG_SPLIT_DELIM_CAPTURE);
+                $res = preg_split('/((?>'.$match.')+)/s',$str,0,PREG_SPLIT_DELIM_CAPTURE);
                 for($i=0; $i < count($res); $i+=2)
                 {
                     $res[$i] = self::convertBytesToEntities(array(1=>$res[$i]));

classes/PHPTAL/NothingKeyword.php

@@ -26,11 +26,13 @@ public function __toString()
         return 'null';
     }
 
+    #[\ReturnTypeWillChange]
     public function count()
     {
         return 0;
     }
 
+    #[\ReturnTypeWillChange]
     public function jsonSerialize()
     {
         return null;

classes/PHPTAL/Php/Attribute/I18N/Attributes.php

@@ -68,7 +68,7 @@ public function before(PHPTAL_Php_CodeWriter $codewriter)
             list($qname, $key) = $this->parseSetExpression($exp);
 
             // if the translation key is specified and not empty (but may be '0')
-            if (strlen($key)) {
+            if ($key !== null && strlen($key) > 0) {
                 // we use it and replace the tag attribute with the result of the translation
                 $code = $this->_getTranslationCode($codewriter, $key);
             } else {

classes/PHPTAL/Php/TalesInternal.php

@@ -459,7 +459,7 @@ private static function convertExpressionsToExpression(array $array, $nothrow)
      */
     public static function compileToPHPExpressions($expression, $nothrow=false)
     {
-        $expression = trim($expression);
+        $expression = trim($expression ?? '');
 
         // Look for tales modifier (string:, exists:, Namespaced\Tale:, etc...)
         if (preg_match('/^([a-z](?:[a-z0-9._\\\\-]*[a-z0-9])?):(.*)$/si', $expression, $m)) {

classes/PHPTAL/RepeatController.php

@@ -87,6 +87,7 @@ public function __construct($source)
      *
      * @return Mixed    The current element value
      */
+    #[\ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
@@ -97,6 +98,7 @@ public function current()
      *
      * @return String/Int   The current element key
      */
+    #[\ReturnTypeWillChange]
     public function key()
     {
         return $this->key;
@@ -107,6 +109,7 @@ public function key()
      *
      * @return bool     True if the iteration is not finished yet
      */
+    #[\ReturnTypeWillChange]
     public function valid()
     {
         $valid = $this->valid || $this->validOnNext;
@@ -142,6 +145,7 @@ public function length()
      * Restarts the iteration process going back to the first element
      *
      */
+    #[\ReturnTypeWillChange]
     public function rewind()
     {
         $this->index = 0;
@@ -168,6 +172,7 @@ public function rewind()
      * Fetches the next element in the iteration and advances the pointer
      *
      */
+    #[\ReturnTypeWillChange]
     public function next()
     {
         $this->index++;

classes/PHPTAL/Tokenizer.php

@@ -47,7 +47,9 @@ function nextToken()
         }
 
         //if (!preg_match_all($this->regex, $this->str, $m, PREG_SET_ORDER, $this->offset)) throw new Exception("FAIL {$this->regex} at {$this->offset}");
-        if (!preg_match($this->regex, $this->str, $m, null, $this->offset)) throw new Exception("FAIL {$this->regex} didn't match '{$this->str}' at {$this->offset}");
+        if (!preg_match($this->regex, $this->str, $m, 0, $this->offset)) {
+            throw new Exception("FAIL {$this->regex} didn't match '{$this->str}' at {$this->offset}");
+        }
 
         $this->offset += strlen($m[0]); // in bytes