Update TopologyDescription::hasReadableServer()

Author: tanlisu

src/MongoDB/TopologyDescription.c

@@ -60,14 +60,24 @@ static PHP_METHOD(TopologyDescription, getServers)
 	mongoc_server_descriptions_destroy_all(sds, n);
 } /* }}} */
 
-/* {{{ proto boolean MongoDB\Driver\TopologyDescription::hasReadableServer()
+/* {{{ proto boolean MongoDB\Driver\TopologyDescription::hasReadableServer([?MongoDB\Driver\ReadPreference $readPreference])
     Returns whether the topology has a readable server available */
 static PHP_METHOD(TopologyDescription, hasReadableServer)
 {
-	php_phongo_topologydescription_t* intern          = Z_TOPOLOGYDESCRIPTION_OBJ_P(getThis());
-	const mongoc_read_prefs_t*        read_preference = NULL;
+	php_phongo_topologydescription_t* intern;
+	const mongoc_read_prefs_t*        read_preference   = NULL;
+	zval*                             z_read_preference = NULL;
 
-	PHONGO_PARSE_PARAMETERS_NONE();
+	intern = Z_TOPOLOGYDESCRIPTION_OBJ_P(getThis());
+
+	PHONGO_PARSE_PARAMETERS_START(0, 1)
+	Z_PARAM_OPTIONAL
+	Z_PARAM_ZVAL_EX(z_read_preference, 1, 0)
+	PHONGO_PARSE_PARAMETERS_END();
+
+	if (z_read_preference) {
+		read_preference = phongo_read_preference_from_zval(z_read_preference);
+	}
 
 	RETVAL_BOOL(mongoc_topology_description_has_readable_server(intern->topology_description, read_preference));
 } /* }}} */

tests/topologyDescription/topologyDescription-hasReadableServer-002.phpt

@@ -0,0 +1,44 @@
+--TEST--
+MongoDB\Driver\TopologyDescription::hasReadableServer()
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php skip_if_not_live(); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+$manager = create_test_manager();
+
+class MySubscriber implements MongoDB\Driver\Monitoring\SDAMSubscriber
+{
+    public function topologyChanged(MongoDB\Driver\Monitoring\TopologyChangedEvent $event)
+    {
+        $expected_types = array(
+            MongoDB\Driver\TopologyDescription::TYPE_UNKNOWN,
+            MongoDB\Driver\TopologyDescription::TYPE_SINGLE,
+            MongoDB\Driver\TopologyDescription::TYPE_SHARDED,
+            MongoDB\Driver\TopologyDescription::TYPE_REPLICA_SET_NO_PRIMARY,
+            MongoDB\Driver\TopologyDescription::TYPE_REPLICA_SET_WITH_PRIMARY
+        );
+
+        $topologyDescription = $event->getNewDescription();
+        $rp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
+        
+        var_dump($topologyDescription->hasReadableServer($rp));
+    }
+}
+
+$subscriber = new MySubscriber;
+MongoDB\Driver\Monitoring\addSubscriber($subscriber);
+
+$command = new MongoDB\Driver\Command(['ping' => 1]);
+$manager->executeCommand(DATABASE_NAME, $command);
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(%s)
+bool(%s)
+bool(%s)
+===DONE===