Merge pull request #47 from patchlevel/allow-psalm-v6

Allow psalm 6 as dep, update workflow to support both versions

.github/workflows/psalm.yml

@@ -18,6 +18,7 @@ jobs:
         strategy:
             matrix:
                 dependencies:
+                    - "lowest"
                     - "locked"
                 php-version:
                     - "8.3"
@@ -41,4 +42,9 @@ jobs:
                 dependency-versions: ${{ matrix.dependencies }}
 
             - name: "psalm"
+              if: ${{ matrix.dependencies != 'locked' }}
+              run: "vendor/bin/psalm"
+
+            - name: "psalm"
+              if: ${{ matrix.dependencies == 'locked' }}
               run: "vendor/bin/psalm --shepherd --stats"

baseline.xml

@@ -1,2 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.23.1@8471a896ccea3526b26d082f4461eeea467f10a4"/>
+<files psalm-version="6.4.0@04f312ac6ea48ba1c3e5db4d815bf6d74641c0ee">
+  <file src="src/Plugin.php">
+    <UnusedClass>
+      <code><![CDATA[Plugin]]></code>
+    </UnusedClass>
+  </file>
+  <file src="tests/Valid/NameChanged.php">
+    <PossiblyUnusedMethod>
+      <code><![CDATA[__construct]]></code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="tests/Valid/Profile.php">
+    <PossiblyUnusedMethod>
+      <code><![CDATA[applyProfileCreated]]></code>
+      <code><![CDATA[create]]></code>
+      <code><![CDATA[id]]></code>
+      <code><![CDATA[name]]></code>
+    </PossiblyUnusedMethod>
+  </file>
+  <file src="tests/Valid/ProfileProjection.php">
+    <PossiblyUnusedParam>
+      <code><![CDATA[$id]]></code>
+    </PossiblyUnusedParam>
+    <UnusedClass>
+      <code><![CDATA[ProfileProjection]]></code>
+    </UnusedClass>
+  </file>
+</files>

composer.json

@@ -20,7 +20,7 @@
   ],
   "require": {
     "php": "~8.1 || ~8.2 || ~8.3",
-    "vimeo/psalm": "^5.0.0",
+    "vimeo/psalm": "^5.14.0 || ^6.0.0",
     "ext-simplexml": "*"
   },
   "require-dev": {
@@ -29,6 +29,9 @@
     "roave/security-advisories": "dev-master",
     "symfony/var-dumper": "^7.0.0"
   },
+  "conflict": {
+    "netresearch/jsonmapper": "^1.0"
+  },
   "config": {
     "preferred-install": {
       "*": "dist"