Remove deprecated terminology for secondary

Author: alcaeus

php_phongo.c

@@ -1553,7 +1553,7 @@ static bool php_phongo_apply_options_to_uri(mongoc_uri_t* uri, bson_t* options)
 			!strcasecmp(key, MONGOC_URI_READPREFERENCE) ||
 			!strcasecmp(key, MONGOC_URI_READPREFERENCETAGS) ||
 			!strcasecmp(key, MONGOC_URI_SAFE) ||
-			!strcasecmp(key, MONGOC_URI_SLAVEOK) ||
+			!strcasecmp(key, MONGOC_URI_SECONDARYOK) ||
 			!strcasecmp(key, MONGOC_URI_W) ||
 			!strcasecmp(key, MONGOC_URI_WTIMEOUTMS)) {
 
@@ -1793,7 +1793,6 @@ static bool php_phongo_apply_rp_options_to_uri(mongoc_uri_t* uri, bson_t* option
 	bson_iter_t                iter;
 	mongoc_read_prefs_t*       new_rp;
 	const mongoc_read_prefs_t* old_rp;
-	bool                       ignore_slaveok = false;
 
 	if (!(old_rp = mongoc_uri_get_read_prefs_t(uri))) {
 		phongo_throw_exception(PHONGO_ERROR_MONGOC_FAILED, "mongoc_uri_t does not have a read preference");
@@ -1811,19 +1810,6 @@ static bool php_phongo_apply_rp_options_to_uri(mongoc_uri_t* uri, bson_t* option
 	while (bson_iter_next(&iter)) {
 		const char* key = bson_iter_key(&iter);
 
-		if (!ignore_slaveok && !strcasecmp(key, MONGOC_URI_SLAVEOK)) {
-			if (!BSON_ITER_HOLDS_BOOL(&iter)) {
-				PHONGO_URI_INVALID_TYPE(iter, "boolean");
-				mongoc_read_prefs_destroy(new_rp);
-
-				return false;
-			}
-
-			if (bson_iter_bool(&iter)) {
-				mongoc_read_prefs_set_mode(new_rp, MONGOC_READ_SECONDARY_PREFERRED);
-			}
-		}
-
 		if (!strcasecmp(key, MONGOC_URI_READPREFERENCE)) {
 			const char* str;
 
@@ -1852,8 +1838,6 @@ static bool php_phongo_apply_rp_options_to_uri(mongoc_uri_t* uri, bson_t* option
 
 				return false;
 			}
-
-			ignore_slaveok = true;
 		}
 
 		if (!strcasecmp(key, MONGOC_URI_READPREFERENCETAGS)) {

tests/manager/manager-ctor-read_preference-004.phpt

@@ -14,7 +14,7 @@ $secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::
 $secondary = $manager->selectServer($secondaryRp);
 
 /* Note: this is testing that the read preference (even a conflicting one) has
- * no effect when directly querying a server, since the slaveOk flag is always
+ * no effect when directly querying a server, since the secondaryOk flag is always
  * set for hinted commands. */
 $primaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::RP_PRIMARY);
 $cursor = $secondary->executeCommand(DATABASE_NAME, new MongoDB\Driver\Command(array('ping' => 1)), $primaryRp);

tests/manager/manager-ctor-read_preference-error-003.phpt

@@ -23,7 +23,7 @@ $secondaryRp = new MongoDB\Driver\ReadPreference(MongoDB\Driver\ReadPreference::
 $secondary = $manager->selectServer($secondaryRp);
 
 /* Note: this is testing that the read preference (even a conflicting one) has
- * no effect when directly querying a server, since the slaveOk flag is always
+ * no effect when directly querying a server, since the secondaryOk flag is always
  * set for hinted queries. */
 $cursor = $secondary->executeQuery(NS, new MongoDB\Driver\Query(['x' => 1]), $primaryRp);