Update to psalm 5

Author: alcaeus

composer.json

@@ -20,7 +20,7 @@
         "squizlabs/php_codesniffer": "^3.7",
         "doctrine/coding-standard": "^11.1",
         "symfony/phpunit-bridge": "^5.2",
-        "vimeo/psalm": "^4.28"
+        "vimeo/psalm": "^5"
     },
     "autoload": {
         "psr-4": { "MongoDB\\": "src/" },

psalm-baseline.xml

@@ -2,6 +2,8 @@
 <psalm
     errorLevel="1"
     errorBaseline="psalm-baseline.xml"
+    findUnusedBaselineEntry="false"
+    findUnusedCode="false"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

psalm.xml.dist

@@ -162,12 +162,8 @@ public function __get(string $databaseName)
         return $this->selectDatabase($databaseName);
     }
 
-    /**
-     * Return the connection string (i.e. URI).
-     *
-     * @return string
-     */
-    public function __toString()
+    /** Return the connection string (i.e. URI). */
+    public function __toString(): string
     {
         return $this->uri;
     }

src/Client.php

@@ -185,9 +185,8 @@ public function __debugInfo()
      * Return the collection namespace (e.g. "db.collection").
      *
      * @see https://mongodb.com/docs/manual/core/databases-and-collections/
-     * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return $this->databaseName . '.' . $this->collectionName;
     }

src/Collection.php

@@ -173,12 +173,8 @@ public function __get(string $collectionName)
         return $this->selectCollection($collectionName);
     }
 
-    /**
-     * Return the database name.
-     *
-     * @return string
-     */
-    public function __toString()
+    /** Return the database name. */
+    public function __toString(): string
     {
         return $this->databaseName;
     }

src/Database.php

@@ -85,6 +85,7 @@ public function bsonSerialize()
     #[ReturnTypeWillChange]
     public function bsonUnserialize(array $data)
     {
+        /** @psalm-suppress DirectConstructorCall */
         self::__construct($data);
     }
 

src/Model/BSONArray.php

@@ -61,12 +61,8 @@ public function __debugInfo()
         return $this->info;
     }
 
-    /**
-     * Return the index name to allow casting IndexInfo to string.
-     *
-     * @return string
-     */
-    public function __toString()
+    /** Return the index name to allow casting IndexInfo to string. */
+    public function __toString(): string
     {
         return $this->getName();
     }

src/Model/IndexInfo.php

@@ -74,9 +74,7 @@ public function __construct(array $index)
         $this->index = $index;
     }
 
-    /**
-     * Return the index name.
-     */
+    /** Return the index name. */
     public function __toString(): string
     {
         return $this->index['name'];

src/Model/IndexInput.php

@@ -230,7 +230,7 @@ public function __construct(string $databaseName, ?string $collectionName, array
             unset($options['writeConcern']);
         }
 
-        $this->isExplain = ! empty($options['explain']);
+        $this->isExplain = $options['explain'] ?? false;
         $this->isWrite = is_last_pipeline_operator_write($pipeline) && ! $this->isExplain;
 
         // Explain does not use a cursor