Update psalm.xml

fp4php · May 22, 2023 · cabed4b · cabed4b
1 parent decef3c
commit cabed4b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 37 deletions.
diff --git a/psalm.xml b/psalm.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0"?>
-<psalm
-        errorLevel="1"
-        findUnusedBaselineEntry="false"
-        findUnusedCode="false"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xmlns="https://getpsalm.org/schema/config"
-        findUnusedPsalmSuppress="true"
-        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
+<psalm errorLevel="1"
+       findUnusedBaselineEntry="false"
+       findUnusedCode="false"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="https://getpsalm.org/schema/config"
+       findUnusedPsalmSuppress="true"
+       xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd">
     <projectFiles>
         <directory name="src"/>
         <directory name="tests"/>
@@ -17,37 +15,11 @@
     </projectFiles>
     <issueHandlers>
         <Trace errorLevel="error"/>
-        <DeprecatedMethod errorLevel="suppress">
-            <errorLevel type="suppress">
-                <directory name="tests"/>
-            </errorLevel>
-        </DeprecatedMethod>
-        <UnusedVariable errorLevel="suppress">
-            <errorLevel type="suppress">
-                <directory name="src/Fp/Functions"/>
-            </errorLevel>
-        </UnusedVariable>
-        <DuplicateFunction errorLevel="suppress">
-            <errorLevel type="suppress">
-                <directory name="src/Fp/Functions"/>
-            </errorLevel>
-        </DuplicateFunction>
         <PropertyNotSetInConstructor errorLevel="suppress">
             <errorLevel type="suppress">
                 <directory name="tests"/>
             </errorLevel>
         </PropertyNotSetInConstructor>
-        <DuplicateClass errorLevel="suppress">
-            <errorLevel type="suppress">
-                <directory name="src/Fp/Functional"/>
-            </errorLevel>
-        </DuplicateClass>
-        <UnusedClosureParam errorLevel="suppress"/>
-        <UnusedMethodCall errorLevel="suppress">
-            <errorLevel type="suppress">
-                <directory name="tests"/>
-            </errorLevel>
-        </UnusedMethodCall>
     </issueHandlers>
     <plugins>
         <pluginClass class="Fp\PsalmPlugin\FunctionalPlugin"/>

diff --git a/tests/Runtime/Classes/ExtensionTest.php b/tests/Runtime/Classes/ExtensionTest.php
@@ -137,7 +137,7 @@ public function testCallStaticExtensionMethod(object $instance, string $extClass
 
     public function testAddInstanceMethodTwice(): void
     {
-        $this->expectErrorMessage("Instance extension method '{$this->testMethodName}' is already defined!");
+        $this->expectExceptionMessage("Instance extension method '{$this->testMethodName}' is already defined!");
 
         ArrayListExtensions::addInstanceExtension($this->testMethodName, function(ArrayList $list): int {
             /** @var ArrayList<int> $list */;
@@ -147,7 +147,7 @@ public function testAddInstanceMethodTwice(): void
 
     public function testAddStaticMethodTwice(): void
     {
-        $this->expectErrorMessage("Static extension method '{$this->testStaticMethodName}' is already defined!");
+        $this->expectExceptionMessage("Static extension method '{$this->testStaticMethodName}' is already defined!");
 
         ArrayListExtensions::addStaticExtension($this->testStaticMethodName, function(string $string): ArrayList {
             return ArrayList::collect(str_split($string));