Merge pull request #80

Author: jmikola

src/MongoDB/Manager.c

@@ -29,6 +29,7 @@
 #include <mongoc.h>
 #include <mongoc-client-private.h>
 #include <mongoc-host-list-private.h>
+#include <mongoc-server-description-private.h>
 
 /* PHP Core stuff */
 #include <php.h>
@@ -312,11 +313,16 @@ PHP_METHOD(Manager, getServers)
 	array_init(return_value);
 	set = intern->client->topology->description.servers;
 	for(i=0; i<set->items_len; i++) {
+		mongoc_server_description_t *sd = (mongoc_server_description_t *) set->items[i].item;
 		zval *obj = NULL;
 
+		if (sd->type == MONGOC_SERVER_UNKNOWN) {
+			continue;
+		}
+
 		MAKE_STD_ZVAL(obj);
 
-		phongo_server_init(obj, intern->client, ((mongoc_server_description_t *)set->items[i].item)->id TSRMLS_CC);
+		phongo_server_init(obj, intern->client, sd->id TSRMLS_CC);
 		add_next_index_zval(return_value, obj);
 	}
 }

tests/manager/manager-getservers-001.phpt

@@ -0,0 +1,43 @@
+--TEST--
+MongoDB\Driver\Manager::getServers() (standalone)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; CLEANUP(STANDALONE); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+function assertServerType($type) {
+    if ($type === MongoDB\Driver\Server::TYPE_STANDALONE) {
+        printf("Found standalone server type: %d\n", $type);
+    } else {
+        printf("Unexpected server type: %d\n", $type);
+    }
+}
+
+$manager = new MongoDB\Driver\Manager(STANDALONE);
+
+$servers = $manager->getServers();
+printf("Known servers: %d\n", count($servers));
+
+echo "Pinging\n";
+$command = new MongoDB\Driver\Command(array('ping' => 1));
+$manager->executeCommand(DATABASE_NAME, $command);
+
+$servers = $manager->getServers();
+printf("Known servers: %d\n", count($servers));
+
+foreach ($servers as $server) {
+    printf("Found server: %s:%d\n", $server->getHost(), $server->getPort());
+    assertServerType($server->getType());
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Known servers: 0
+Pinging
+Known servers: 1
+Found server: %s:%d
+Found standalone server type: 1
+===DONE===

tests/manager/manager-getservers-002.phpt

@@ -0,0 +1,54 @@
+--TEST--
+MongoDB\Driver\Manager::getServers() (replica set)
+--SKIPIF--
+<?php require __DIR__ . "/../utils/basic-skipif.inc"; ?>
+<?php NEEDS("REPLICASET"); CLEANUP(REPLICASET); ?>
+--FILE--
+<?php
+require_once __DIR__ . "/../utils/basic.inc";
+
+function assertServerType($type) {
+    $rsTypes = array(
+        MongoDB\Driver\Server::TYPE_RS_PRIMARY,
+        MongoDB\Driver\Server::TYPE_RS_SECONDARY,
+        MongoDB\Driver\Server::TYPE_RS_ARBITER,
+    );
+
+    if (in_array($type, $rsTypes, true)) {
+        printf("Found replica set server type: %d\n", $type);
+    } else {
+        printf("Unexpected server type: %d\n", $type);
+    }
+}
+
+$manager = new MongoDB\Driver\Manager(REPLICASET);
+
+$servers = $manager->getServers();
+printf("Known servers: %d\n", count($servers));
+
+echo "Pinging\n";
+$command = new MongoDB\Driver\Command(array('ping' => 1));
+$manager->executeCommand(DATABASE_NAME, $command);
+
+$servers = $manager->getServers();
+printf("Known servers: %d\n", count($servers));
+
+foreach ($servers as $server) {
+    printf("Found server: %s:%d\n", $server->getHost(), $server->getPort());
+    assertServerType($server->getType());
+}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Known servers: 0
+Pinging
+Known servers: 3
+Found server: %s:%d
+Found replica set server type: %r(4|5|6)%r
+Found server: %s:%d
+Found replica set server type: %r(4|5|6)%r
+Found server: %s:%d
+Found replica set server type: %r(4|5|6)%r
+===DONE===

tests/replicaset/manager-getservers-001.phpt

@@ -1,5 +1,5 @@
 --TEST--
-MongoDB\Driver\Manager: getServers()
+MongoDB\Driver\Manager::getServers()
 --SKIPIF--
 <?php require __DIR__ . "/../utils/basic-skipif.inc"; NEEDS("REPLICASET"); ?>
 --FILE--