use php8 compatible version of psalm for static analysis, and fix som…

…e errors
kdl-org · Dec 22, 2024 · 9378e9e · 9378e9e
1 parent c04546a
commit 9378e9e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -29,9 +29,15 @@
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.0",
-        "vimeo/psalm": "^4.3.2",
+        "vimeo/psalm": "dev-php84",
         "squizlabs/php_codesniffer": "^3.5.8",
         "ext-json": "*",
         "phpbench/phpbench": "^1.0"
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/GromNaN/psalm"
+        }
+    ]
 }
diff --git a/src/Kdl.php b/src/Kdl.php
@@ -4,6 +4,9 @@
 
 namespace Kdl\Kdl;
 
+/**
+ * @psalm-api
+ */
 final class Kdl
 {
     /**

diff --git a/src/ParseException.php b/src/ParseException.php
@@ -8,5 +8,4 @@
  */
 class ParseException extends \InvalidArgumentException
 {
-
 }
diff --git a/src/grammar.php b/src/grammar.php
@@ -6,7 +6,7 @@
 
 use Parsica\Parsica\Parser;
 
-use function Parsica\Parsica\{andPred,
+use function Parsica\Parsica\{
     anySingleBut,
     assemble,
     atLeastOne,
@@ -153,7 +153,7 @@ function nodeSpace(): Parser
     return memo(
         __FUNCTION__,
         fn() => either(assemble(zeroOrMore(ws()), escline(), zeroOrMore(ws())), atLeastOne(ws()))
-            ->map(fn($x) => null)
+            ->map(fn($_x) => null)
             ->label('node-space')
     );
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,9 @@ @@
     namespace Kdl\Kdl;
+    /**
+     * @psalm-api
+     */
     final class Kdl
     {
         /**
@@ Expand Down @@