Merge pull request #459

tests/Database/DatabaseFunctionalTest.php

@@ -91,7 +91,7 @@ class DatabaseFunctionalTest extends FunctionalTestCase
         $commandResult = current($cursor->toArray());
 
         $this->assertCommandSucceeded($commandResult);
-        $this->assertTrue(isset($commandResult->ismaster));
+        $this->assertObjectHasAttribute('ismaster', $commandResult);
         $this->assertTrue($commandResult->ismaster);
     }
 
@@ -110,7 +110,7 @@ class DatabaseFunctionalTest extends FunctionalTestCase
 
         $this->assertCommandSucceeded($commandResult);
         $this->assertInternalType('array', $commandResult);
-        $this->assertTrue(isset($commandResult['ismaster']));
+        $this->assertArrayHasKey('ismaster', $commandResult);
         $this->assertTrue($commandResult['ismaster']);
     }
 

tests/Model/IndexInfoTest.php

@@ -80,7 +80,7 @@ class IndexInfoTest extends TestCase
         $this->assertFalse($info->isSparse());
         $this->assertTrue($info->isTtl());
         $this->assertFalse($info->isUnique());
-        $this->assertTrue(isset($info['expireAfterSeconds']));
+        $this->assertArrayHasKey('expireAfterSeconds', $info);
         $this->assertSame(100, $info['expireAfterSeconds']);
     }
 
@@ -107,7 +107,7 @@ class IndexInfoTest extends TestCase
         ]);
 
         $this->assertInstanceOf('ArrayAccess', $info);
-        $this->assertTrue(isset($info['name']));
+        $this->assertArrayHasKey('name', $info);
         $this->assertSame('x_1', $info['name']);
     }
 

tests/Operation/ChangeStreamFunctionalTest.php

@@ -143,7 +143,7 @@ class ChangeStreamFunctionalTest extends FunctionalTestCase
 
         $changeStreamResult = $this->collection->watch();
 
-        $this->assertSame(null, $changeStreamResult->key());
+        $this->assertNull($changeStreamResult->key());
 
         $result = $this->collection->insertOne(['x' => 1]);
         $this->assertInstanceOf('MongoDB\InsertOneResult', $result);
@@ -153,15 +153,15 @@ class ChangeStreamFunctionalTest extends FunctionalTestCase
         $this->assertSame(1, $changeStreamResult->key());
 
         $changeStreamResult->next();
-        $this->assertSame(null, $changeStreamResult->key());
+        $this->assertNull($changeStreamResult->key());
         $changeStreamResult->next();
-        $this->assertSame(null, $changeStreamResult->key());
+        $this->assertNull($changeStreamResult->key());
 
         $operation = new DatabaseCommand($this->getDatabaseName(), ["killCursors" => $this->getCollectionName(), "cursors" => [$changeStreamResult->getCursorId()]]);
         $operation->execute($this->getPrimaryServer());
 
         $changeStreamResult->next();
-        $this->assertSame(null, $changeStreamResult->key());
+        $this->assertNull($changeStreamResult->key());
 
         $result = $this->collection->insertOne(['x' => 2]);
         $this->assertInstanceOf('MongoDB\InsertOneResult', $result);