Remove MissingReturnType psalm ignore

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Apr 28, 2020 · b8b5c02 · b8b5c02
1 parent 2bf02b6
commit b8b5c02
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
@@ -3419,7 +3419,7 @@ public function getDbSpecificPrivsQueriesForChangeOrCopyUser(
      * @param string $alter_real_sql_query SQL query for ALTER USER
      * @param string $alter_sql_query      SQL query for ALTER USER to be displayed
      *
-     * @return array, $message
+     * @return array<int,string|Message>
      */
     public function addUserAndCreateDatabase(
         $_error,
@@ -3430,7 +3430,7 @@ public function addUserAndCreateDatabase(
         $dbname,
         $alter_real_sql_query,
         $alter_sql_query
-    ) {
+    ): array {
         if ($_error || (! empty($real_sql_query)
             && ! $this->dbi->tryQuery($real_sql_query))
         ) {

diff --git a/psalm.xml b/psalm.xml
@@ -33,7 +33,6 @@
         <InternalClass errorLevel="info" />
 
         <MissingClosureReturnType errorLevel="info" />
-        <MissingReturnType errorLevel="info" />
         <MissingPropertyType errorLevel="info" />
         <InvalidDocblock errorLevel="info" />
         <MisplacedRequiredParam errorLevel="info" />

diff --git a/test/classes/Server/PrivilegesTest.php b/test/classes/Server/PrivilegesTest.php
@@ -16,6 +16,7 @@
 use PhpMyAdmin\Tests\Stubs\DbiDummy;
 use PhpMyAdmin\Url;
 use PhpMyAdmin\Util;
+use PhpMyAdmin\Message;
 use PHPUnit\Framework\TestCase;
 use stdClass;
 use function htmlspecialchars;
@@ -1127,6 +1128,8 @@ public function testGetSqlQueriesForDisplayAndAddUser()
             $sql_query
         );
 
+        $this->assertInstanceOf(Message::class, $message);
+
         //validate 6: $message
         $this->assertEquals(
             'You have added a new user.',