Merge v1.x into v2.x (#1597)

Author: mongodb-php-bot

.github/actions/setup/action.yml

@@ -49,7 +49,5 @@ runs:
     - name: Install dependencies with Composer
       uses: ramsey/composer-install@3.0.0
       with:
-        # Revert when psalm supports PHP 8.4
-        # composer-options: "--no-suggest"
-        composer-options: "--no-suggest ${{ inputs.php-version == '8.4' && '--ignore-platform-req=php+' || '' }}"
+        composer-options: "--no-suggest"
         working-directory: "${{ inputs.working-directory }}"

composer.json

@@ -23,7 +23,7 @@
         "phpunit/phpunit": "^10.5.35",
         "rector/rector": "^1.2",
         "squizlabs/php_codesniffer": "^3.7",
-        "vimeo/psalm": "^5.13"
+        "vimeo/psalm": "^6.5"
     },
     "replace": {
         "mongodb/builder": "*"

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.26.1@d747f6500b38ac4f7dfc5edbcae6e4b637d7add0">
+<files psalm-version="6.5.1@3f17a6b24a2dbe543e21408c2b19108cf6a355ef">
   <file src="examples/atlas_search.php">
     <MixedArgument>
       <code><![CDATA[$document['name']]]></code>
@@ -696,9 +696,6 @@
       <code><![CDATA[$options['writeConcern']]]></code>
       <code><![CDATA[$value]]></code>
     </MixedAssignment>
-    <MixedInferredReturnType>
-      <code><![CDATA[array|object|null]]></code>
-    </MixedInferredReturnType>
     <MixedMethodCall>
       <code><![CDATA[decode]]></code>
       <code><![CDATA[isInTransaction]]></code>
@@ -817,9 +814,6 @@
     <MixedAssignment>
       <code><![CDATA[$this->postBatchResumeToken]]></code>
     </MixedAssignment>
-    <MixedInferredReturnType>
-      <code><![CDATA[array|object|null]]></code>
-    </MixedInferredReturnType>
     <MixedPropertyFetch>
       <code><![CDATA[$reply->cursor->firstBatch]]></code>
       <code><![CDATA[$reply->cursor->postBatchResumeToken]]></code>
@@ -858,10 +852,6 @@
       <code><![CDATA[$typeMap['fieldPaths'][$fieldPath]]]></code>
       <code><![CDATA[$value]]></code>
     </MixedAssignment>
-    <MixedInferredReturnType>
-      <code><![CDATA[array|object|null]]></code>
-      <code><![CDATA[array|object|null]]></code>
-    </MixedInferredReturnType>
     <MixedReturnStatement>
       <code><![CDATA[$collectionInfo['options']['encryptedFields'] ?? null]]></code>
       <code><![CDATA[$collectionInfo['options']['encryptedFields'] ?? null]]></code>

psalm.xml.dist

@@ -2,6 +2,8 @@
 <psalm
     errorLevel="1"
     errorBaseline="psalm-baseline.xml"
+    ignoreInternalFunctionFalseReturn="true"
+    ignoreInternalFunctionNullReturn="true"
     resolveFromConfigFile="true"
     findUnusedBaselineEntry="true"
     findUnusedCode="false"
@@ -18,9 +20,6 @@
     </projectFiles>
 
     <stubs>
-        <file name="stubs/BSON/Document.stub.php"/>
-        <file name="stubs/BSON/Iterator.stub.php"/>
-        <file name="stubs/BSON/PackedArray.stub.php"/>
         <file name="stubs/Driver/Cursor.stub.php"/>
         <file name="stubs/Driver/CursorInterface.stub.php"/>
         <file name="stubs/Driver/WriteResult.stub.php"/>