Fix coding standard errors

Author: tanlisu

src/Collection.php

@@ -1010,7 +1010,7 @@ public function mapReduce(JavascriptInterface $map, JavascriptInterface $reduce,
      *
      * @see RenameCollection::__construct() for supported options
      * @param string $newCollectionName New name for this collection
-     * @param array $options Additional options
+     * @param array  $options           Additional options
      * @return array|object Command result document
      * @throws UnsupportedException if options are not supported by the selected server
      * @throws InvalidArgumentException for parameter/option parsing errors

src/Database.php

@@ -475,8 +475,9 @@ public function modifyCollection($collectionName, array $collectionOptions, arra
      * Rename a collection within this database.
      *
      * @see RenameCollection::__construct() for supported options
+     * @param string $collectionName    Collection name
      * @param string $newCollectionName New name for this collection
-     * @param array  $options        Additional options
+     * @param array  $options           Additional options
      * @return array|object Command result document
      * @throws UnsupportedException if options are unsupported on the selected server
      * @throws InvalidArgumentException for parameter/option parsing errors

src/Operation/RenameCollection.php

@@ -24,8 +24,10 @@
 use MongoDB\Driver\WriteConcern;
 use MongoDB\Exception\InvalidArgumentException;
 use MongoDB\Exception\UnsupportedException;
+
 use function current;
 use function is_array;
+use function is_bool;
 use function MongoDB\server_supports_feature;
 
 /**
@@ -79,9 +81,10 @@ class RenameCollection implements Executable
      *    This is not supported for server versions < 3.4 and will result in an
      *    exception at execution time if used.
      *
-     * @param string $databaseName   Database name
-     * @param string $collectionName Collection name
-     * @param array  $options        Command options
+     * @param string $databaseName      Database name
+     * @param string $collectionName    Collection name
+     * @param string $newCollectionName New name for the collection
+     * @param array  $options           Command options
      * @throws InvalidArgumentException for parameter/option parsing errors
      */
     public function __construct($databaseName, $collectionName, $newCollectionName, array $options = [])
@@ -149,8 +152,10 @@ public function execute(Server $server)
             /* The server may return an error if the collection does not exist.
              * Check for an error code (or message for pre-3.2 servers) and
              * return the command reply instead of throwing. */
-            if ($e->getCode() === self::$errorCodeNamespaceNotFound ||
-                $e->getMessage() === self::$errorMessageNamespaceNotFound) {
+            if (
+                $e->getCode() === self::$errorCodeNamespaceNotFound ||
+                $e->getMessage() === self::$errorMessageNamespaceNotFound
+            ) {
                 return $e->getResultDocument();
             }
 

tests/Collection/CollectionFunctionalTest.php

@@ -332,7 +332,7 @@ public function testFindWithinTransaction(): void
         }
     }
 
-    public function testRenameCollection()
+    public function testRenameCollection(): void
     {
         $writeResult = $this->collection->insertOne(['x' => 1]);
         $this->assertEquals(1, $writeResult->getInsertedCount());
@@ -341,7 +341,7 @@ public function testRenameCollection()
         $this->assertCommandSucceeded($commandResult);
     }
 
-    public function testWithOptionsInheritsOptions()
+    public function testWithOptionsInheritsOptions(): void
     {
         $collectionOptions = [
             'readConcern' => new ReadConcern(ReadConcern::LOCAL),

tests/Operation/RenameCollectionFunctionalTest.php

@@ -2,21 +2,22 @@
 
 namespace MongoDB\Tests\Operation;
 
-use MongoDB\Model\CollectionInfo;
-use MongoDB\Model\CollectionInfoIterator;
 use MongoDB\Operation\InsertOne;
 use MongoDB\Operation\ListCollections;
 use MongoDB\Operation\RenameCollection;
 use MongoDB\Tests\CommandObserver;
+
+use function call_user_func;
+use function is_callable;
 use function sprintf;
 use function version_compare;
 
 class RenameCollectionFunctionalTest extends FunctionalTestCase
 {
-    public function testDefaultWriteConcernIsOmitted()
+    public function testDefaultWriteConcernIsOmitted(): void
     {
         (new CommandObserver())->observe(
-            function () {
+            function (): void {
                 $operation = new RenameCollection(
                     'admin',
                     $this->getCollectionName(),
@@ -26,13 +27,13 @@ function () {
 
                 $operation->execute($this->getPrimaryServer());
             },
-            function (array $event) {
+            function (array $event): void {
                 $this->assertObjectNotHasAttribute('writeConcern', $event['started']->getCommand());
             }
         );
     }
 
-    public function testRenameExistingCollection()
+    public function testRenameExistingCollection(): void
     {
         $that = $this;
         $renamedCollectionName = $this->getCollectionName() . '.renamed';
@@ -56,7 +57,7 @@ public function testRenameExistingCollection()
     /**
      * @depends testRenameExistingCollection
      */
-    public function testRenameNonexistentCollection()
+    public function testRenameNonexistentCollection(): void
     {
         $this->assertCollectionDoesNotExist($this->getCollectionName());
 
@@ -68,14 +69,14 @@ public function testRenameNonexistentCollection()
         $this->assertIsObject($commandResult);
     }
 
-    public function testSessionOption()
+    public function testSessionOption(): void
     {
         if (version_compare($this->getServerVersion(), '3.6.0', '<')) {
             $this->markTestSkipped('Sessions are not supported');
         }
 
         (new CommandObserver())->observe(
-            function () {
+            function (): void {
                 $operation = new RenameCollection(
                     'admin',
                     $this->getCollectionName(),
@@ -85,7 +86,7 @@ function () {
 
                 $operation->execute($this->getPrimaryServer());
             },
-            function (array $event) {
+            function (array $event): void {
                 $this->assertObjectHasAttribute('lsid', $event['started']->getCommand());
             }
         );
@@ -97,7 +98,7 @@ function (array $event) {
      *
      * @param string $collectionName
      */
-    private function assertCollectionDoesNotExist($collectionName)
+    private function assertCollectionDoesNotExist(string $collectionName): void
     {
         $operation = new ListCollections('admin');
         $collections = $operation->execute($this->getPrimaryServer());
@@ -124,7 +125,7 @@ private function assertCollectionDoesNotExist($collectionName)
      *
      * @param callable $callback
      */
-    private function assertCollectionExists($collectionName, $callback = null)
+    private function assertCollectionExists($collectionName, ?callable $callback = null): void
     {
         if ($callback !== null && ! is_callable($callback)) {
             throw new InvalidArgumentException('$callback is not a callable');

tests/Operation/RenameCollectionTest.php

@@ -10,7 +10,7 @@ class RenameCollectionTest extends TestCase
     /**
      * @dataProvider provideInvalidConstructorOptions
      */
-    public function testConstructorOptionTypeChecks(array $options)
+    public function testConstructorOptionTypeChecks(array $options): void
     {
         $this->expectException(InvalidArgumentException::class);
         new RenameCollection($this->getDatabaseName(), $this->getCollectionName(), $this->getCollectionName() . '.renamed', $options);