Update psalm defaults for future version 6

Adds tests for unused code and updates baseline with false negatives

Signed-off-by: George Steel <[email protected]>

Author: gsteel

psalm-baseline.xml

@@ -1,8 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.24.0@06dd975cb55d36af80f242561738f16c5f58264f">
+<files psalm-version="5.8.0@9cf4f60a333f779ad3bc704a555920e81d4fdcda">
+  <file src="src/Persistence/CacheHeadersGeneratorTrait.php">
+    <UnusedMethod>
+      <code>generateCacheHeaders</code>
+    </UnusedMethod>
+  </file>
+  <file src="src/RetrieveSession.php">
+    <UnusedConstructor>
+      <code>__construct</code>
+    </UnusedConstructor>
+  </file>
   <file src="src/Session.php">
-    <MixedInferredReturnType occurrences="1"/>
-    <MixedReturnStatement occurrences="1">
+    <MixedInferredReturnType>
+      <code>null|bool|int|float|string|array</code>
+    </MixedInferredReturnType>
+    <MixedReturnStatement>
       <code>json_decode(json_encode($value, JSON_PRESERVE_ZERO_FRACTION), true)</code>
     </MixedReturnStatement>
   </file>

psalm.xml

@@ -3,7 +3,12 @@
     errorLevel="1"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd" errorBaseline="psalm-baseline.xml">
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="true"
+    findUnusedPsalmSuppress="true"
+>
     <projectFiles>
         <directory name="src"/>
         <directory name="test"/>

test/Exception/InvalidHopsValueExceptionTest.php

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MezzioTest\Session\Exception;
+
+use Mezzio\Session\Exception\InvalidHopsValueException;
+use PHPUnit\Framework\TestCase;
+
+class InvalidHopsValueExceptionTest extends TestCase
+{
+    public function testExpectedMessageWhenHopsTooLow(): void
+    {
+        $e = InvalidHopsValueException::valueTooLow('nuts', 99);
+
+        self::assertStringContainsString('"nuts"', $e->getMessage());
+        self::assertStringContainsString('received 99', $e->getMessage());
+    }
+}

test/Exception/InvalidSessionSegmentDataExceptionTest.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MezzioTest\Session\Exception;
+
+use Mezzio\Session\Exception\InvalidSessionSegmentDataException;
+use PHPUnit\Framework\TestCase;
+
+class InvalidSessionSegmentDataExceptionTest extends TestCase
+{
+    public function testExpectedExceptionMessage(): void
+    {
+        $e = InvalidSessionSegmentDataException::whenRetrieving('muppets', 'kermit');
+
+        self::assertEquals(
+            'Cannot retrieve session segment "muppets"; data exists, but as a "string" instead of an array',
+            $e->getMessage(),
+        );
+    }
+}

test/Exception/SessionSegmentConflictExceptionTest.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace MezzioTest\Session\Exception;
+
+use Mezzio\Session\Exception\SessionSegmentConflictException;
+use PHPUnit\Framework\TestCase;
+
+class SessionSegmentConflictExceptionTest extends TestCase
+{
+    public function testWhenRetrieving(): void
+    {
+        $e = SessionSegmentConflictException::whenRetrieving('baz');
+        self::assertStringContainsString('"baz"', $e->getMessage());
+    }
+
+    public function testWhenSetting(): void
+    {
+        $e = SessionSegmentConflictException::whenSetting('qoo');
+        self::assertStringContainsString('"qoo"', $e->getMessage());
+    }
+
+    public function testWhenDeleting(): void
+    {
+        $e = SessionSegmentConflictException::whenDeleting('boo');
+        self::assertStringContainsString('"boo"', $e->getMessage());
+    }
+}