update stan

.phive/phars.xml

@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="2.1.0" installed="2.1.0" location="./tools/phpstan" copy="false"/>
-  <phar name="psalm" version="5.26.1" installed="5.26.1" location="./tools/psalm" copy="false"/>
+  <phar name="phpstan" version="2.1.17" installed="2.1.17" location="./tools/phpstan" copy="false"/>
 </phive>

composer.json

@@ -53,13 +53,8 @@
         "cs-check": "phpcs --colors --parallel=16 -p src/ tests/",
         "cs-fix": "phpcbf --colors --parallel=16 -p src/ tests/",
         "phpstan": "tools/phpstan analyse",
-        "psalm": "tools/psalm --show-info=false",
-        "stan": [
-            "@phpstan",
-            "@psalm"
-        ],
+        "stan": "@phpstan",
         "phpstan-baseline": "tools/phpstan --generate-baseline",
-        "psalm-baseline": "tools/psalm --set-baseline=psalm-baseline.xml",
         "stan-setup": "phive install",
         "test": "phpunit"
     },

src/Command/CompileCommand.php

@@ -49,7 +49,7 @@ public function execute(Arguments $args, ConsoleIo $io)
     {
         $type = $args->getArgumentAt(0);
 
-        /** @psalm-var class-string<\Cake\TwigView\View\TwigView> $viewClass */
+        /** @phpstan-var class-string<\Cake\TwigView\View\TwigView> $viewClass */
         $viewClass = $args->getOption('view-class');
 
         // Setup cached TwigView to avoid creating for every file

src/Filesystem/Scanner.php

@@ -140,10 +140,10 @@ protected static function setupIterator(string $path, array $extensions): Iterat
                 $path,
                 FilesystemIterator::KEY_AS_PATHNAME |
                 FilesystemIterator::CURRENT_AS_FILEINFO |
-                FilesystemIterator::SKIP_DOTS
+                FilesystemIterator::SKIP_DOTS,
             ),
             RecursiveIteratorIterator::CHILD_FIRST,
-            RecursiveIteratorIterator::CATCH_GET_CHILD
+            RecursiveIteratorIterator::CATCH_GET_CHILD,
         ), '/.+' . $extPattern . '$/', RegexIterator::GET_MATCH);
     }
 

src/Twig/Extension/TimeExtension.php

@@ -76,7 +76,7 @@ public function getFunctions(): array
     public function formatDate(
         mixed $date,
         ?string $format = null,
-        DateTimeZone|string|false|null $timezone = null
+        DateTimeZone|string|false|null $timezone = null,
     ): string {
         if (!isset($this->coreExt)) {
             $this->coreExt = new CoreExtension();

src/Twig/Extension/ViewExtension.php

@@ -38,28 +38,28 @@ public function getFunctions(): array
                 function ($context, string $name, array $data = [], array $options = []) {
                     return $context['_view']->cell($name, $data, $options);
                 },
-                ['needs_context' => true, 'is_safe' => ['all']]
+                ['needs_context' => true, 'is_safe' => ['all']],
             ),
             new TwigFunction(
                 'element',
                 function ($context, string $name, array $data = [], array $options = []) {
                     return $context['_view']->element($name, $data, $options);
                 },
-                ['needs_context' => true, 'is_safe' => ['all']]
+                ['needs_context' => true, 'is_safe' => ['all']],
             ),
             new TwigFunction(
                 'fetch',
                 function ($context, string $name, string $default = '') {
                     return $context['_view']->fetch($name, $default);
                 },
-                ['needs_context' => true, 'is_safe' => ['all']]
+                ['needs_context' => true, 'is_safe' => ['all']],
             ),
             new TwigFunction(
                 'helper_*_*',
                 function ($context, $helper, $method, array $args = []) {
                     return $context['_view']->{$helper}->{$method}(...$args);
                 },
-                ['needs_context' => true, 'is_variadic' => true, 'is_safe' => ['all']]
+                ['needs_context' => true, 'is_variadic' => true, 'is_safe' => ['all']],
             ),
         ];
     }

src/Twig/Node/Cell.php

@@ -56,7 +56,7 @@
         ?AbstractExpression $data = null,
         ?AbstractExpression $options = null,
         int $lineno = 0,
-        ?string $tag = null
+        ?string $tag = null,
     ) {
         if ($data === null) {
             $data = new ArrayExpression([], $lineno);
@@ -76,7 +76,7 @@
                 'variable' => $variable,
             ],
             $lineno,
-            $tag
+            $tag,
         );
 
         $this->assign = $assign;

src/Twig/Node/Element.php

@@ -44,7 +44,7 @@
         ?AbstractExpression $data = null,
         ?AbstractExpression $options = null,
         int $lineno = 0,
-        ?string $tag = null
+        ?string $tag = null,
     ) {
         if ($data === null) {
             $data = new ArrayExpression([], $lineno);
@@ -62,7 +62,7 @@
             ],
             [],
             $lineno,
-            $tag
+            $tag,
         );
     }
 

src/View/TwigView.php

@@ -293,7 +293,7 @@ protected function _evaluate(string $templateFile, array $dataForView): string
 
         $dataForView = array_merge(
             $dataForView,
-            iterator_to_array($this->helpers()->getIterator())
+            iterator_to_array($this->helpers()->getIterator()),
         );
 
         return $this->getTwig()->load($templateFile)->render($dataForView);

tests/TestCase/Twig/FileLoaderTest.php

@@ -68,7 +68,7 @@ public function testGetCacheKey()
     {
         $this->assertSame(
             TEST_APP . 'templates/simple.twig',
-            $this->loader->getCacheKey(TEST_APP . 'templates/simple.twig')
+            $this->loader->getCacheKey(TEST_APP . 'templates/simple.twig'),
         );
     }