Consolidate the usage of "either" and "one of" in error messages

Closes GH-6173

3 files changed, 16 insertions, 16 deletions

diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
index 21c107adec..729477ab59 100644
--- a/ext/sockets/sockets.c
+++ b/ext/sockets/sockets.c
@@ -1137,7 +1137,7 @@ PHP_FUNCTION(socket_getsockname)
 			break;
 
 		default:
-			zend_argument_value_error(1, "must be either AF_UNIX, AF_INET, or AF_INET6");
+			zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
 			RETURN_THROWS();
 	}
 }
@@ -1212,7 +1212,7 @@ PHP_FUNCTION(socket_getpeername)
 			break;
 
 		default:
-			zend_argument_value_error(1, "must be either AF_UNIX, AF_INET, or AF_INET6");
+			zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
 			RETURN_THROWS();
 	}
 }
@@ -1233,12 +1233,12 @@ PHP_FUNCTION(socket_create)
 		&& domain != AF_INET6
 #endif
 		&& domain != AF_INET) {
-		zend_argument_value_error(1, "must be either AF_UNIX, AF_INET6, or AF_INET");
+		zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET6, or AF_INET");
 		RETURN_THROWS();
 	}
 
 	if (type > 10) {
-		zend_argument_value_error(2, "must be either SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET,"
+		zend_argument_value_error(2, "must be one of SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET,"
 			" SOCK_RAW, or SOCK_RDM");
 		RETURN_THROWS();
 	}
@@ -1337,7 +1337,7 @@ PHP_FUNCTION(socket_connect)
 		}
 
 		default:
-			zend_argument_value_error(1, "must be either AF_UNIX, AF_INET, or AF_INET6");
+			zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
 			RETURN_THROWS();
 		}
 
@@ -1431,7 +1431,7 @@ PHP_FUNCTION(socket_bind)
 			}
 #endif
 		default:
-			zend_argument_value_error(1, "must be either AF_UNIX, AF_INET, or AF_INET6");
+			zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
 			RETURN_THROWS();
 	}
 
@@ -1625,7 +1625,7 @@ PHP_FUNCTION(socket_recvfrom)
 			break;
 #endif
 		default:
-			zend_argument_value_error(1, "must be either AF_UNIX, AF_INET, or AF_INET6");
+			zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
 			RETURN_THROWS();
 	}
 
@@ -1705,7 +1705,7 @@ PHP_FUNCTION(socket_sendto)
 			break;
 #endif
 		default:
-			zend_argument_value_error(1, "must be either AF_UNIX, AF_INET, or AF_INET6");
+			zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
 			RETURN_THROWS();
 	}
 
@@ -1987,12 +1987,12 @@ PHP_FUNCTION(socket_create_pair)
 		&& domain != AF_INET6
 #endif
 		&& domain != AF_UNIX) {
-		zend_argument_value_error(1, "must be either AF_UNIX, AF_INET6 or AF_INET");
+		zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET6, or AF_INET");
 		RETURN_THROWS();
 	}
 
 	if (type > 10) {
-		zend_argument_value_error(2, "must be either SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET,"
+		zend_argument_value_error(2, "must be one of SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET,"
 			" SOCK_RAW, or SOCK_RDM");
 		RETURN_THROWS();
 	}
@@ -2402,7 +2402,7 @@ PHP_FUNCTION(socket_addrinfo_bind)
 		default:
 			close(php_sock->bsd_socket);
 			zval_ptr_dtor(return_value);
-			zend_argument_value_error(1, "must be either AF_UNIX, AF_INET, or AF_INET6");
+			zend_argument_value_error(1, "must be one of AF_UNIX, AF_INET, or AF_INET6");
 			RETURN_THROWS();
 	}
 
@@ -2463,7 +2463,7 @@ PHP_FUNCTION(socket_addrinfo_connect)
 				break;
 			}
 		default:
-			zend_argument_value_error(1, "socket type must be either AF_UNIX, AF_INET, or AF_INET6");
+			zend_argument_value_error(1, "socket type must be one of AF_UNIX, AF_INET, or AF_INET6");
 			close(php_sock->bsd_socket);
 			zval_ptr_dtor(return_value);
 			RETURN_THROWS();
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
index 1abab2a1e7..ff4dd5de06 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams-win32.phpt
@@ -27,8 +27,8 @@ try {
 ?>
 --EXPECT--
 bool(true)
-socket_create_pair(): Argument #1 ($domain) must be either AF_UNIX, AF_INET6 or AF_INET
-socket_create_pair(): Argument #2 ($type) must be either SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET, SOCK_RAW, or SOCK_RDM
+socket_create_pair(): Argument #1 ($domain) must be one of AF_UNIX, AF_INET6, or AF_INET
+socket_create_pair(): Argument #2 ($type) must be one of SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET, SOCK_RAW, or SOCK_RDM
 --CREDITS--
 Till Klampaeckel, till@php.net
 Berlin TestFest 2009
diff --git a/ext/sockets/tests/socket_create_pair-wrongparams.phpt b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
index 8dc56d1e36..57111c83f1 100644
--- a/ext/sockets/tests/socket_create_pair-wrongparams.phpt
+++ b/ext/sockets/tests/socket_create_pair-wrongparams.phpt
@@ -29,8 +29,8 @@ try {
 --EXPECTF--
 Warning: socket_create_pair(): Unable to create socket pair [%d]: %s not supported in %s on line %d
 bool(false)
-socket_create_pair(): Argument #1 ($domain) must be either AF_UNIX, AF_INET6 or AF_INET
-socket_create_pair(): Argument #2 ($type) must be either SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET, SOCK_RAW, or SOCK_RDM
+socket_create_pair(): Argument #1 ($domain) must be one of AF_UNIX, AF_INET6, or AF_INET
+socket_create_pair(): Argument #2 ($type) must be one of SOCK_STREAM, SOCK_DGRAM, SOCK_SEQPACKET, SOCK_RAW, or SOCK_RDM
 --CREDITS--
 Till Klampaeckel, till@php.net
 Berlin TestFest 2009