Update dependencies

Also add results from a php-cs-fixer run
SC-Networks · Oct 7, 2022 · 21c4dab · 21c4dab
1 parent b73fc61
commit 21c4dab
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 35 deletions.
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -17,7 +17,11 @@ jobs:
     steps:
       - name: Set locales
         run: |
+          sudo locale-gen en_GB
           sudo locale-gen en_GB.utf8
+          sudo locale-gen fr_FR
+          sudo locale-gen fr_FR@euro
+          sudo locale-gen fr_FR.utf8
 
       - uses: actions/checkout@v2
 
@@ -29,16 +33,7 @@ jobs:
       - name: Validate composer.json and composer.lock
         run: composer validate
 
-      - name: Install dependencies
-        if: ${{ matrix.php != '8.2' }}
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 3
-          command: composer update --no-interaction --no-progress
-
-      - name: Install Dependencies (ignore platform)
-        if: ${{ matrix.php == '8.2' }}
+      - name: Install Dependencies
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5

diff --git a/composer.json b/composer.json
@@ -30,18 +30,19 @@
         }
     ],
     "require": {
+        "php": "^8.1",
         "ext-dom": "*",
         "ext-gettext": "*",
         "ext-simplexml": "*",
-        "php": "^8.1",
-        "symfony/polyfill-mbstring": "^1.12"
+        "symfony/polyfill-mbstring": "^1.12",
+        "symfony/polyfill-php82": "^1.26"
     },
     "require-dev": {
         "ext-mbstring": "*",
         "friendsofphp/php-cs-fixer": "^3",
         "phpstan/phpstan": "^1.3",
         "phpunit/phpunit": "^9.5",
-        "rector/rector": "^0.13.5"
+        "rector/rector": "^0.14"
     },
     "autoload": {
         "classmap": [

diff --git a/src/Context.php b/src/Context.php
@@ -14,6 +14,7 @@
 
 namespace PhpTal;
 
+use AllowDynamicProperties;
 use ArrayAccess;
 use BadMethodCallException;
 use Countable;
@@ -22,8 +23,8 @@
 /**
  * This class handles template execution context.
  * Holds template variables and carries state/scope across macro executions.
- *
  */
+#[AllowDynamicProperties]
 class Context
 {
     /**

diff --git a/src/Dom/SaxXmlParser.php b/src/Dom/SaxXmlParser.php
@@ -37,7 +37,6 @@
  */
 class SaxXmlParser
 {
-
     // available parser states
     public const ST_ROOT = 0;
     public const ST_TEXT = 1;
@@ -231,7 +230,7 @@ public function parseString(DocumentBuilder $builder, string $src, string $filen
                                 $mark = $i + 1; // mark text start
                                 $state = self::ST_TEXT;
                                 $builder->onElementStart($tagname, $attributes);
-                            } else /* isWhiteChar */ {
+                            } else { /* isWhiteChar */
                                 $state = self::ST_TAG_ATTRIBUTES;
                             }
                         }
@@ -342,7 +341,7 @@ public function parseString(DocumentBuilder $builder, string $src, string $filen
 
                             if ($c === '=') {
                                 $state = self::ST_ATTR_VALUE;
-                            } else /* white char */ {
+                            } else { /* white char */
                                 $state = self::ST_ATTR_EQ;
                             }
                         } elseif ($c === '/' || $c === '>') {

diff --git a/src/Php/Attribute/PHPTAL/Debug.php b/src/Php/Attribute/PHPTAL/Debug.php
@@ -23,7 +23,6 @@
  */
 class Debug extends Attribute
 {
-
     /**
      * @var bool
      */

diff --git a/src/Php/Attribute/PHPTAL/Tales.php b/src/Php/Attribute/PHPTAL/Tales.php
@@ -24,7 +24,6 @@
  */
 class Tales extends Attribute
 {
-
     /**
      * @var string
      */

diff --git a/src/Php/Transformer.php b/src/Php/Transformer.php
@@ -101,8 +101,8 @@ public static function transform(string $str, ?string $prefix = null): string
                         continue 2;
                     }
 
-                // no specific state defined, just eat char and see what to do with it.
-                // no break
+                    // no specific state defined, just eat char and see what to do with it.
+                    // no break
                 case self::ST_NONE:
                     // begin of eval without {
                     if ($c === '$' && $i + 1 < $len && self::isAlpha($str[$i + 1])) {
@@ -146,7 +146,7 @@ public static function transform(string $str, ?string $prefix = null): string
                     }
                     break;
 
-                // $xxx
+                    // $xxx
                 case self::ST_EVAL:
                     if (!self::isVarNameChar($c)) {
                         $result .= $prefix . substr($str, $mark, $i - $mark);
@@ -155,7 +155,7 @@ public static function transform(string $str, ?string $prefix = null): string
                     }
                     break;
 
-                // single quoted string
+                    // single quoted string
                 case self::ST_STR:
                     if ($c === '\\') {
                         $backslashed = true;
@@ -168,7 +168,7 @@ public static function transform(string $str, ?string $prefix = null): string
                     }
                     break;
 
-                // double quoted string
+                    // double quoted string
                 case self::ST_ESTR:
                     if ($c === '\\') {
                         $backslashed = true;
@@ -197,7 +197,7 @@ public static function transform(string $str, ?string $prefix = null): string
                     }
                     break;
 
-                // var state
+                    // var state
                 case self::ST_VAR:
                     if (self::isVarNameChar($c)) {
                         // noop
@@ -255,7 +255,7 @@ public static function transform(string $str, ?string $prefix = null): string
                     }
                     break;
 
-                // object member
+                    // object member
                 case self::ST_MEMBER:
                     if (self::isVarNameChar($c)) {
                         // noop
@@ -310,7 +310,7 @@ public static function transform(string $str, ?string $prefix = null): string
                     }
                     break;
 
-                // wait for separator
+                    // wait for separator
                 case self::ST_DEFINE:
                     if (self::isVarNameChar($c)) {
                         // noop
@@ -321,10 +321,10 @@ public static function transform(string $str, ?string $prefix = null): string
                     }
                     break;
 
-                // static call, can be const, static var, static method
-                // Klass::$static
-                // Klass::const
-                // Kclass::staticMethod()
+                    // static call, can be const, static var, static method
+                    // Klass::$static
+                    // Klass::const
+                    // Kclass::staticMethod()
                 //
                 case self::ST_STATIC:
                     if (self::isVarNameChar($c)) {
@@ -355,7 +355,7 @@ public static function transform(string $str, ?string $prefix = null): string
                     }
                     break;
 
-                // numeric value
+                    // numeric value
                 case self::ST_NUM:
                     if (!self::isDigitCompound($c)) {
                         $var = substr($str, $mark, $i - $mark);

diff --git a/src/PhpTalInterface.php b/src/PhpTalInterface.php
@@ -11,7 +11,6 @@
  */
 interface PhpTalInterface
 {
-
     /**
      * Set template from file path.
      *

diff --git a/src/TalesRegistry.php b/src/TalesRegistry.php
@@ -26,7 +26,6 @@
  */
 final class TalesRegistry implements TalesRegistryInterface
 {
-
     /**
      * @var array<
      *  string,

diff --git a/tests/TalTestCaseCommentTest.php b/tests/TalTestCaseCommentTest.php
@@ -49,7 +49,6 @@ public function setUp(): void
         $state = new State($this->newPHPTAL());
         $this->gen = new CodeWriter($state);
         $this->tag = new DummyPhpNode();
-        $this->tag->codewriter = $this->gen;
     }
 
     private function newComment(string $expr): void