Merge pull request #812 from cakephp/upgrade-psalm

Upgrade to psalm 4.3

Author: othercorey

composer.json

@@ -56,7 +56,7 @@
         "cs-fix": "phpcbf --colors --parallel=16 -p src/ tests/",
         "test": "phpunit",
         "psalm": "psalm.phar --show-info=false",
-        "psalm-setup": "cp composer.json composer.backup && composer require --dev psalm/phar:^3.11 && mv composer.backup composer.json"
+        "psalm-setup": "cp composer.json composer.backup && composer require --dev psalm/phar:^4.3 && mv composer.backup composer.json"
     },
     "prefer-stable": true
 }

psalm-baseline.xml

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <files psalm-version="3.18.2@19aa905f7c3c7350569999a93c40ae91ae4e1626">
   <file src="src/Controller/DashboardController.php">
-    <InvalidNullableReturnType occurrences="1">
-      <code>\Cake\Http\Response</code>
-    </InvalidNullableReturnType>
     <NullableReturnStatement occurrences="1">
       <code>$this-&gt;redirect(['action' =&gt; 'index'])</code>
     </NullableReturnStatement>
@@ -19,9 +16,6 @@
     </InternalProperty>
   </file>
   <file src="src/DebugInclude.php">
-    <InvalidNullableReturnType occurrences="1">
-      <code>string</code>
-    </InvalidNullableReturnType>
     <PossiblyNullArrayOffset occurrences="2">
       <code>$this-&gt;_composerPaths</code>
       <code>$this-&gt;_pluginPaths</code>

src/Controller/DashboardController.php

@@ -57,7 +57,7 @@ public function index()
     /**
      * Reset SQLite DB.
      *
-     * @return \Cake\Http\Response
+     * @return \Cake\Http\Response|null
      */
     public function reset()
     {

src/DebugInclude.php

@@ -16,6 +16,7 @@
 
 use Cake\Core\Plugin as CorePlugin;
 use Composer\Json\JsonFile;
+use InvalidArgumentException;
 
 /**
  * Contains methods for Providing list of files.
@@ -173,6 +174,8 @@ public function niceFileName($file, $type, $name = null)
             case 'vendor':
                 return str_replace($this->_composerPaths[$name], '', $file);
         }
+
+        throw new InvalidArgumentException("Type `{$type}` is not supported.");
     }
 
     /**

src/Panel/MailPanel.php

@@ -29,7 +29,7 @@ class MailPanel extends DebugPanel
     /**
      * The list of emails produced during the request
      *
-     * @var \ArrayObject
+     * @var \ArrayObject|null
      */
     protected $emailLog;