Merge branch 'master' into phplib-1202

Author: jmikola

composer.json

@@ -24,7 +24,7 @@
         "rector/rector": "^0.16.0",
         "squizlabs/php_codesniffer": "^3.7",
         "symfony/phpunit-bridge": "^5.2",
-        "vimeo/psalm": "^4.28"
+        "vimeo/psalm": "^5.13"
     },
     "autoload": {
         "psr-4": { "MongoDB\\": "src/" },

docs/examples/csfle-explicit_encryption.php

@@ -41,6 +41,8 @@
 
 /* Using the client configured without encryption, find the document and observe
  * that the field is not automatically decrypted. */
+
+/** @var object{encryptedField: Binary} $document */
 $document = $collection->findOne();
 
 print_r($document);

examples/changestream.php

@@ -53,7 +53,7 @@ function toJSON(object $document): string
     $changeStream->next();
 
     if (time() - $startTime > 3) {
-        printf("Aborting after 3 seconds...\n");
+        echo "Aborting after 3 seconds...\n";
         break;
     }
 }

examples/command_logger.php

@@ -31,14 +31,14 @@ public function commandStarted(CommandStartedEvent $event): void
         printf("%s command started\n", $event->getCommandName());
 
         printf("command: %s\n", toJson($event->getCommand()));
-        printf("\n");
+        echo "\n";
     }
 
     public function commandSucceeded(CommandSucceededEvent $event): void
     {
         printf("%s command succeeded\n", $event->getCommandName());
         printf("reply: %s\n", toJson($event->getReply()));
-        printf("\n");
+        echo "\n";
     }
 
     public function commandFailed(CommandFailedEvent $event): void
@@ -50,7 +50,7 @@ public function commandFailed(CommandFailedEvent $event): void
         printf("exception: %s\n", get_class($exception));
         printf("exception.code: %d\n", $exception->getCode());
         printf("exception.message: %s\n", $exception->getMessage());
-        printf("\n");
+        echo "\n";
     }
 }