Merge pull request #17 from weierophinney/feature/psalm-integration

Provide Psalm integration

Author: weierophinney

composer.json

@@ -53,7 +53,9 @@
         "laminas/laminas-coding-standard": "~2.2.0",
         "laminas/laminas-db": "^2.8.1",
         "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^9.3"
+        "phpunit/phpunit": "^9.3",
+        "psalm/plugin-phpunit": "^0.16.0",
+        "vimeo/psalm": "^4.7"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<psalm
+    totallyTyped="true"
+    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"
+>
+    <projectFiles>
+        <directory name="config"/>
+        <directory name="src"/>
+        <directory name="test"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+        </ignoreFiles>
+    </projectFiles>
+
+    <issueHandlers>
+        <InternalMethod>
+            <errorLevel type="suppress">
+                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::method"/>
+            </errorLevel>
+            <errorLevel type="suppress">
+                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::willReturn"/>
+            </errorLevel>
+            <errorLevel type="suppress">
+                <referencedMethod name="PHPUnit\Framework\MockObject\Builder\InvocationMocker::with"/>
+            </errorLevel>
+        </InternalMethod>
+    </issueHandlers>
+
+    <plugins>
+        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
+    </plugins>
+</psalm>

psalm-baseline.xml

@@ -334,6 +334,7 @@ public function onRoute(MvcEvent $e)
      * Add HTTP Method without body content
      *
      * @param string $method
+     * @return void
      */
     public function addMethodWithoutBody($method)
     {
@@ -396,10 +397,9 @@ protected function removeEmptyData(array $data, array $compareTo = [])
          * Callback for array_filter() to remove null values (array_filter() removes 'false' values)
          *
          * @param mixed $value
-         * @param null  $key
-         * @return bool
+         * @param null|int|string $key
          */
-        $removeNull = function ($value, $key = null) use ($compareTo) {
+        $removeNull = function ($value, $key = null) use ($compareTo): bool {
             // If comparison array is empty, do a straight comparison
             if (empty($compareTo)) {
                 return null !== $value;

psalm.xml.dist

@@ -55,6 +55,7 @@ public function createService(ServiceLocatorInterface $validators)
      * Implemented for backwards compatibility.
      *
      * @param array $options
+     * @return void
      */
     public function setCreationOptions(array $options)
     {

src/ContentValidationListener.php

@@ -55,6 +55,7 @@ public function createService(ServiceLocatorInterface $validators)
      * Implemented for backwards compatibility.
      *
      * @param array $options
+     * @return void
      */
     public function setCreationOptions(array $options)
     {