From d94a1a54aaa34161c4d0cbb31da5c3056134e5a8 Mon Sep 17 00:00:00 2001
From: Niklas Keller <me@kelunik.com>
Date: Fri, 3 Dec 2021 00:58:44 +0100
Subject: [PATCH] Fix psalm config

---
 .github/workflows/ci.yml |  5 +++--
 composer.json            |  3 +--
 psalm.xml                | 11 -----------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b3895a..59a3500 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,10 +68,11 @@ jobs:
             composer info -D
 
       - name: Run tests
-        env:
-          PHP_CS_FIXER_IGNORE_ENV: 1
         run: vendor/bin/phpunit ${{ matrix.phpunit-flags }}
 
+      - name: Run static analysis
+        run: vendor/bin/psalm.phar
+
       - name: Run style fixer
         env:
           PHP_CS_FIXER_IGNORE_ENV: 1
diff --git a/composer.json b/composer.json
index 04fcfca..710d3a0 100644
--- a/composer.json
+++ b/composer.json
@@ -41,8 +41,7 @@
         "amphp/phpunit-util": "v2.x-dev",
         "amphp/php-cs-fixer-config": "dev-master",
         "phpunit/phpunit": "^9",
-        "psalm/phar": "^4.7",
-        "jetbrains/phpstorm-stubs": "^2019.3"
+        "psalm/phar": "^4.13"
     },
     "autoload": {
         "psr-4": {
diff --git a/psalm.xml b/psalm.xml
index 24f0981..5225354 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -9,14 +9,12 @@
         xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
-        <directory name="examples" />
         <directory name="src" />
     </projectFiles>
 
     <issueHandlers>
         <StringIncrement>
             <errorLevel type="suppress">
-                <directory name="examples" />
                 <directory name="src" />
             </errorLevel>
         </StringIncrement>
@@ -35,23 +33,14 @@
 
         <MissingClosureParamType>
             <errorLevel type="suppress">
-                <directory name="examples" />
                 <directory name="src" />
             </errorLevel>
         </MissingClosureParamType>
 
         <MissingClosureReturnType>
             <errorLevel type="suppress">
-                <directory name="examples" />
                 <directory name="src" />
             </errorLevel>
         </MissingClosureReturnType>
     </issueHandlers>
-
-    <stubs>
-        <file name="vendor/jetbrains/phpstorm-stubs/Ev/Ev.php" />
-        <file name="vendor/jetbrains/phpstorm-stubs/event/event.php" />
-        <file name="vendor/jetbrains/phpstorm-stubs/uv/UV.php" />
-        <file name="vendor/jetbrains/phpstorm-stubs/uv/uv_functions.php" />
-    </stubs>
 </psalm>