PHPC-1870 and PHPC-1872: Fix zSeries builds and testing with RS arbiters (#1232)

* PHPC-1870: Include config.h after php.h to avoid redef of WORDS_BIGENDIAN

This should fix zSeries build failures introduced by 324182a

* PHPC-1872: Count data-bearing nodes for write concern

WC using the total server count cannot be satisfied if the RS includes arbiters.

Author: jmikola

src/phongo_apm.c

@@ -14,10 +14,6 @@
  * limitations under the License.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "bson/bson.h"
 #include "mongoc/mongoc.h"
 
@@ -26,6 +22,10 @@
 #include <Zend/zend_interfaces.h>
 #include <Zend/zend_operators.h>
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "phongo_compat.h"
 #include "php_phongo.h"
 #include "phongo_apm.h"

tests/server/server-executeQuery-008.phpt

@@ -13,11 +13,15 @@ $manager = create_test_manager();
 
 $primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
 $primary = $manager->selectServer($primaryRp);
-$serverCount = count($manager->getServers());
+
+// Count all data-bearing members to use for the write concern
+$dataBearingNodes = count(array_filter($manager->getServers(), function (MongoDB\Driver\Server $server) {
+    return ($server->isPrimary() || $server->isSecondary());
+}));
 
 $bulk = new \MongoDB\Driver\BulkWrite;
 $bulk->insert(['_id' => 1, 'x' => 1]);
-$primary->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern($serverCount));
+$primary->executeBulkWrite(NS, $bulk, new MongoDB\Driver\WriteConcern($dataBearingNodes));
 
 $secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_SECONDARY);
 $secondary = $manager->selectServer($secondaryRp);