Apply suggestions from code review

Co-authored-by: Jeremy Mikola <[email protected]>

Author: tanlisu

src/MongoDB/TopologyDescription.c

@@ -105,7 +105,7 @@ static PHP_METHOD(TopologyDescription, getType)
 /* {{{ MongoDB\Driver\TopologyDescription function entries */
 /* clang-format off */
 ZEND_BEGIN_ARG_INFO_EX(ai_TopologyDescription_hasReadableServer, 0, 0, 0)
-	ZEND_ARG_OBJ_INFO(0, readPreference, MongoDB\\Driver\\ReadPreference, 1)
+	ZEND_ARG_OBJ_INFO(0, readPreference, MongoDB\\Driver\\ReadPreference, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(ai_TopologyDescription_void, 0, 0, 0)

tests/topologyDescription/topologyDescription-debug-001.phpt

@@ -41,6 +41,6 @@ object(MongoDB\Driver\TopologyDescription)#%d (%d) {
     %a
   }
   ["type"]=>
-  string(%d) "%rSingle|Sharded|ReplicaSetWithPrimary%r"
+  string(%d) "%r(Single|Sharded|ReplicaSetWithPrimary)%r"
 }
 ===DONE===

tests/topologyDescription/topologyDescription-getServers-001.phpt

@@ -27,20 +27,25 @@ class TopologyDescriptionProvider implements MongoDB\Driver\Monitoring\SDAMSubsc
     }
 }
 
-function assertIsServerDescriptionsArray(array $sds) {
+function isArrayOfServerDescriptions(array $sds) {
+    if (count($sds) < 1) {
+        return false;
+    }
+
     foreach ($sds as $sd) {
         if (! $sd instanceof MongoDB\Driver\ServerDescription) {
             return false;
         }
     }
+    
     return true;
 }
 
 $subscriber = new TopologyDescriptionProvider;
 $topologyDescription = $subscriber->getTopologyDescription();
 $serverDescriptions = $topologyDescription->getServers();
 
-var_dump(assertIsServerDescriptionsArray($serverDescriptions));
+var_dump(isArrayOfServerDescriptions($serverDescriptions));
 
 ?>
 ===DONE===

tests/topologyDescription/topologyDescription-getType-001.phpt

@@ -35,5 +35,5 @@ var_dump($topologyDescription->getType());
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-string(%d) "%rSingle|Sharded|ReplicaSetWithPrimary%r"
+string(%d) "%r(Single|Sharded|ReplicaSetWithPrimary)%r"
 ===DONE===

tests/topologyDescription/topologyDescription-hasReadableServer_error-001.phpt

@@ -0,0 +1,55 @@
+--TEST--
+MongoDB\Driver\TopologyDescription::hasReadableServer() (argument with bad type)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_live(); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+class TopologyDescriptionProvider implements MongoDB\Driver\Monitoring\SDAMSubscriber
+{
+    private $topologyDescription;
+
+    public function topologyChanged(MongoDB\Driver\Monitoring\TopologyChangedEvent $event)
+    {
+        $this->topologyDescription = $event->getNewDescription();
+    }
+
+    public function getTopologyDescription()
+    {
+        $manager = create_test_manager();
+        $manager->addSubscriber($this);
+        $manager->executeCommand(DATABASE_NAME, new MongoDB\Driver\Command(['ping' => 1]));
+        $manager->removeSubscriber($this);
+
+        return $this->topologyDescription;
+    }
+}
+
+$tests = [
+    null,
+    1,
+    [],
+];
+
+$subscriber = new TopologyDescriptionProvider;
+$topologyDescription = $subscriber->getTopologyDescription();
+
+foreach ($tests as $test) {
+    echo throws(function() use ($topologyDescription, $test) {
+        $topologyDescription->hasReadableServer($test);
+    }, TypeError::class), "\n";
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECT--
+OK: Got TypeError
+MongoDB\Driver\TopologyDescription::hasReadableServer(): Argument #1 ($readPreference) must be of type MongoDB\Driver\ReadPreference, null given
+OK: Got TypeError
+MongoDB\Driver\TopologyDescription::hasReadableServer(): Argument #1 ($readPreference) must be of type MongoDB\Driver\ReadPreference, int given
+OK: Got TypeError
+MongoDB\Driver\TopologyDescription::hasReadableServer(): Argument #1 ($readPreference) must be of type MongoDB\Driver\ReadPreference, array given
+===DONE===