Updated psalm to version 6.0. Updated cache configurations.

.gitignore

@@ -28,9 +28,3 @@ symfony.lock
 /deployment.phar
 /deploy/
 ###< deploy ###
-
-###> ci ###
-.php-cs-fixer.cache
-.phpunit.result.cache
-.twig-cs-fixer.cache
-###< ci ###

.php-cs-fixer.dist.php

@@ -74,6 +74,7 @@
 
 return $config
     ->setParallelConfig(ParallelConfigFactory::detect())
+    ->setCacheFile(__DIR__ . '/var/cache/php-cs-fixer/.php-cs-fixer.cache')
     ->setRiskyAllowed(true)
     ->setFinder($finder)
     ->setRules($rules);

.twig-cs-fixer.php

@@ -12,8 +12,14 @@
 
 use TwigCsFixer\Config\Config;
 
+$cache_dir = __DIR__ . '/var/cache/twig-cs-fixer/';
+if (!file_exists($cache_dir)) {
+    mkdir($cache_dir, 0777, true);
+}
+
 $config = new Config();
 $config->allowNonFixableRules()
+    ->setCacheFile($cache_dir . '/.twig-cs-fixer.cache')
     ->getFinder()
     ->in('templates');
 

phpstan.neon

@@ -1,5 +1,6 @@
 parameters:
     level: 8
+    tmpDir: var/cache/phpstan
     paths:
         - src
         - tests

phpunit.xml.dist

@@ -2,6 +2,7 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.4/phpunit.xsd"
          bootstrap="tests/bootstrap.php"
+         cacheDirectory="var/cache/phpunit"
          displayDetailsOnTestsThatTriggerNotices="true"
          displayDetailsOnTestsThatTriggerWarnings="true"
          displayDetailsOnTestsThatTriggerDeprecations="true"

psalm.xml

@@ -2,6 +2,7 @@
 <psalm xmlns="https://getpsalm.org/schema/config"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+       cacheDirectory="var/cache/psalm"
        allowStringToStandInForClass="true"
        findUnusedVariablesAndParams="true"
        findUnusedBaselineEntry="true"

rector.php

@@ -21,6 +21,7 @@
 use Rector\Symfony\Set\TwigSetList;
 
 return RectorConfig::configure()
+    ->withCache(__DIR__ . '/var/cache/rector')
     ->withRootFiles()
     ->withPaths([
         __DIR__ . '/config',

src/Controller/HelpController.php

@@ -197,7 +197,9 @@ private function getTargetPath(HelpDownloadQuery $query): ?string
         if (\is_numeric(\end($parts))) {
             \array_pop($parts);
         }
+        /** @psalm-var string $first */
         $first = \reset($parts);
+        /** @psalm-var string $last */
         $last = \end($parts);
         if ($first === $last) {
             $last = 'list';

src/Pivot/Field/PivotWeekdayField.php

@@ -36,7 +36,9 @@ public function __construct(protected string $name, protected ?string $title = n
     {
         parent::__construct($name, self::PART_WEEK_DAY, $title);
 
-        $firstDay = \strtolower(\date('l', \strtotime('this week')));
+        /** @psalm-var int<1, max> $time */
+        $time = \strtotime('this week');
+        $firstDay = \strtolower(\date('l', $time));
         $this->names = $short ? DateUtils::getShortWeekdays($firstDay) : DateUtils::getWeekdays($firstDay);
     }
 

src/Report/CalculationByMonthReport.php

@@ -196,6 +196,7 @@ private function getArrowColor(PdfColorInterface $color): PdfTextColor
             return $this->colors[$color] = $color->getTextColor();
         }
 
+        /** @psalm-var PdfTextColor */
         return $this->colors[$color];
     }
 

src/Service/AES256EncryptorService.php

@@ -94,6 +94,7 @@ public function encrypt(string $data): string|false
      */
     public function encryptJson(mixed $data, int $flags = 0): string|false
     {
+        /** @psalm-var non-empty-string $encoded */
         $encoded = \json_encode($data, $flags | \JSON_THROW_ON_ERROR);
 
         return $this->encrypt($encoded);

src/Service/CountryFlagService.php

@@ -82,6 +82,10 @@ private function getChoiceEntry(string $code, string $name, bool $flagOnly): str
 
     private function getEmojiChar(string $chr): string
     {
-        return \mb_chr(self::REGIONAL_OFFSET + \mb_ord($chr, 'UTF-8'), 'UTF-8');
+        /** @psalm-var int $order */
+        $order = \mb_ord($chr, 'UTF-8');
+
+        /** @psalm-var string */
+        return \mb_chr(self::REGIONAL_OFFSET + $order, 'UTF-8');
     }
 }

src/Service/SwissPostUpdater.php

@@ -163,6 +163,7 @@ public function import(UploadedFile|string|null $sourceFile, bool $overwrite): S
 
     private function clean(string $str): string
     {
+        /** @psalm-var string */
         return \mb_convert_encoding(\trim($str), 'UTF-8', 'ISO-8859-1');
     }
 

src/Utils/StringUtils.php

@@ -108,6 +108,7 @@ public static function decodeJson(string $value, bool $assoc = true, int $flags
     public static function encodeJson(mixed $value, int $flags = 0): string
     {
         try {
+            /** @psalm-var non-empty-string */
             return \json_encode($value, $flags | \JSON_THROW_ON_ERROR);
         } catch (\JsonException $e) {
             $message = \sprintf("Unable to encode value '%s'.", \get_debug_type($value));

tests/Controller/HelpControllerTest.php

@@ -155,7 +155,7 @@ private function checkUrl(string $url): void
     private function getDownloadImage(): string
     {
         $path = __DIR__ . '/../files/images/example.png';
-        $type = \mime_content_type($path);
+        $type = (string) \mime_content_type($path);
         $data = (string) \file_get_contents($path);
         $encoded = \base64_encode($data);
 

tests/Enums/ImageExtensionTest.php

@@ -23,6 +23,7 @@ class ImageExtensionTest extends TestCase
 {
     public static function getCreateImages(): \Iterator
     {
+        /** @psalm-var non-empty-string $dir */
         $dir = \realpath(__DIR__ . '/../files/images');
         yield [ImageExtension::BMP, $dir . '/example.bmp'];
         yield [ImageExtension::GIF, $dir . '/example.gif'];

tests/Utils/StringUtilsTest.php

@@ -139,8 +139,9 @@ public function testCapitalize(string $value, string $expected): void
     public function testDecodeJsonArray(): void
     {
         $expected = ['key' => 'value'];
+        /** @psalm-var non-empty-string $encoded */
         $encoded = \json_encode($expected);
-        $actual = StringUtils::decodeJson($encoded); // @phpstan-ignore argument.type
+        $actual = StringUtils::decodeJson($encoded);
         self::assertSame($expected, $actual);
     }
 
@@ -149,8 +150,9 @@ public function testDecodeJsonObject(): void
         $expected = new \stdClass();
         $expected->key = 'value';
         $expected->date = 'date';
+        /** @psalm-var non-empty-string $encoded */
         $encoded = \json_encode($expected);
-        $actual = StringUtils::decodeJson($encoded, false); // @phpstan-ignore argument.type
+        $actual = StringUtils::decodeJson($encoded, false);
         self::assertObjectHasProperty('key', $actual);
         self::assertObjectHasProperty('date', $actual);
         self::assertSame($expected->key, $actual->key);

vendor-bin/psalm/composer.json

@@ -1,7 +1,7 @@
 {
     "require": {
         "php": "^8.2",
-        "vimeo/psalm": "^5.0",
+        "vimeo/psalm": "^6.0",
         "weirdan/doctrine-psalm-plugin": "^2.0",
         "psalm/plugin-phpunit": "^0.19",
         "psalm/plugin-symfony": "^5.0"