PHPLIB-766: Fix deprecation notices for PHP 8.1 (#874)

* Avoid calling strlen() on non-strings

* Add return types to Iterator implementation

* Make parameters required in tests

Those arguments are always passed by the data providers.

* Avoid passing objects to key()

* Add missing ReturnTypeWillChange attribute to Iterator classes

These were likely missed in 27f6648

Co-authored-by: Fran Moreno <[email protected]>

Author: jmikola

src/Collection.php

@@ -140,11 +140,11 @@ class Collection
      */
     public function __construct(Manager $manager, $databaseName, $collectionName, array $options = [])
     {
-        if (strlen($databaseName) < 1) {
+        if (strlen((string) $databaseName) < 1) {
             throw new InvalidArgumentException('$databaseName is invalid: ' . $databaseName);
         }
 
-        if (strlen($collectionName) < 1) {
+        if (strlen((string) $collectionName) < 1) {
             throw new InvalidArgumentException('$collectionName is invalid: ' . $collectionName);
         }
 

src/Database.php

@@ -114,7 +114,7 @@ class Database
      */
     public function __construct(Manager $manager, $databaseName, array $options = [])
     {
-        if (strlen($databaseName) < 1) {
+        if (strlen((string) $databaseName) < 1) {
             throw new InvalidArgumentException('$databaseName is invalid: ' . $databaseName);
         }
 

src/Model/CollectionInfoCommandIterator.php

@@ -18,6 +18,7 @@
 namespace MongoDB\Model;
 
 use IteratorIterator;
+use ReturnTypeWillChange;
 use Traversable;
 
 /**
@@ -53,6 +54,7 @@ public function __construct(Traversable $iterator, $databaseName = null)
      * @see http://php.net/iterator.current
      * @return CollectionInfo
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         $info = parent::current();

src/Model/IndexInfoIteratorIterator.php

@@ -18,6 +18,7 @@
 namespace MongoDB\Model;
 
 use IteratorIterator;
+use ReturnTypeWillChange;
 use Traversable;
 
 use function array_key_exists;
@@ -57,6 +58,7 @@ public function __construct(Traversable $iterator, $ns = null)
      * @see http://php.net/iterator.current
      * @return IndexInfo
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         $info = parent::current();

tests/FunctionalTestCase.php

@@ -267,7 +267,7 @@ public function configureFailPoint($command, ?Server $server = null): void
             throw new InvalidArgumentException('$command is not an array or stdClass instance');
         }
 
-        if (key($command) !== 'configureFailPoint') {
+        if (key((array) $command) !== 'configureFailPoint') {
             throw new InvalidArgumentException('$command is not a configureFailPoint command');
         }
 

tests/Model/BSONIteratorTest.php

@@ -17,7 +17,7 @@ class BSONIteratorTest extends TestCase
     /**
      * @dataProvider provideTypeMapOptionsAndExpectedDocuments
      */
-    public function testValidValues(?array $typeMap = null, $binaryString, array $expectedDocuments): void
+    public function testValidValues(?array $typeMap, $binaryString, array $expectedDocuments): void
     {
         $bsonIt = new BSONIterator($binaryString, ['typeMap' => $typeMap]);
 

tests/Model/CachingIteratorTest.php

@@ -122,7 +122,7 @@ public function testWithWrongIterator(): void
             /** @var int */
             private $i = 0;
 
-            public function current()
+            public function current(): int
             {
                 return $this->i;
             }
@@ -132,12 +132,12 @@ public function next(): void
                 $this->i++;
             }
 
-            public function key()
+            public function key(): int
             {
                 return $this->i;
             }
 
-            public function valid()
+            public function valid(): bool
             {
                 return $this->i == 0;
             }

tests/Operation/AggregateFunctionalTest.php

@@ -170,7 +170,7 @@ function (array $event): void {
     /**
      * @dataProvider provideTypeMapOptionsAndExpectedDocuments
      */
-    public function testTypeMapOption(?array $typeMap = null, array $expectedDocuments): void
+    public function testTypeMapOption(?array $typeMap, array $expectedDocuments): void
     {
         $this->createFixtures(3);
 
@@ -185,7 +185,7 @@ public function testTypeMapOption(?array $typeMap = null, array $expectedDocumen
     /**
      * @dataProvider provideTypeMapOptionsAndExpectedDocuments
      */
-    public function testTypeMapOptionWithoutCursor(?array $typeMap = null, array $expectedDocuments): void
+    public function testTypeMapOptionWithoutCursor(?array $typeMap, array $expectedDocuments): void
     {
         if (version_compare($this->getServerVersion(), '3.6.0', '>=')) {
             $this->markTestSkipped('Aggregations with useCursor == false are not supported');

tests/Operation/FindAndModifyFunctionalTest.php

@@ -162,7 +162,7 @@ function (array $event): void {
     /**
      * @dataProvider provideTypeMapOptionsAndExpectedDocument
      */
-    public function testTypeMapOption(?array $typeMap = null, $expectedDocument): void
+    public function testTypeMapOption(?array $typeMap, $expectedDocument): void
     {
         $this->createFixtures(1);
 

tests/Operation/MapReduceFunctionalTest.php

@@ -235,7 +235,7 @@ function (array $event): void {
     /**
      * @dataProvider provideTypeMapOptionsAndExpectedDocuments
      */
-    public function testTypeMapOptionWithInlineResults(?array $typeMap = null, array $expectedDocuments): void
+    public function testTypeMapOptionWithInlineResults(?array $typeMap, array $expectedDocuments): void
     {
         $this->createFixtures(3);
 
@@ -282,7 +282,7 @@ public function provideTypeMapOptionsAndExpectedDocuments()
     /**
      * @dataProvider provideTypeMapOptionsAndExpectedDocuments
      */
-    public function testTypeMapOptionWithOutputCollection(?array $typeMap = null, array $expectedDocuments): void
+    public function testTypeMapOptionWithOutputCollection(?array $typeMap, array $expectedDocuments): void
     {
         $this->createFixtures(3);