Add switch error handling to other strpos variants

Author: Girgias

ext/mbstring/mbstring.c

@@ -2116,20 +2116,24 @@ PHP_FUNCTION(mb_strpos)
 		RETVAL_LONG(n);
 	} else {
 		switch (-n) {
-		case 1:
-			break;
-		case 2:
-			zend_value_error("Needle has not positive length");
-			RETURN_THROWS();
-		case 4:
-			zend_value_error("Unknown encoding or conversion error");
-			RETURN_THROWS();
-		case 8:
-			zend_value_error("Argument is empty");
-			RETURN_THROWS();
-		default:
-			zend_value_error("Unknown error in mb_strpos");
-			RETURN_THROWS();
+			case 1:
+				/* Returns false */
+				break;
+			case 2:
+				zend_value_error("Needle has not positive length");
+				RETURN_THROWS();
+			case 4:
+				zend_value_error("Unknown encoding or conversion error");
+				RETURN_THROWS();
+			case 8:
+				zend_value_error("Argument is empty");
+				RETURN_THROWS();
+			case 16:
+				zend_value_error("Offset not contained in string");
+				RETURN_THROWS();
+			default:
+				zend_value_error("Unknown error in mb_strripos");
+				RETURN_THROWS();
 		}
 		RETVAL_FALSE;
 	}
@@ -2167,6 +2171,26 @@ PHP_FUNCTION(mb_strrpos)
 	if (!mbfl_is_error(n)) {
 		RETVAL_LONG(n);
 	} else {
+		switch (-n) {
+			case 1:
+				/* Returns false */
+				break;
+			case 2:
+				zend_value_error("Needle has not positive length");
+				RETURN_THROWS();
+			case 4:
+				zend_value_error("Unknown encoding or conversion error");
+				RETURN_THROWS();
+			case 8:
+				zend_value_error("Argument is empty");
+				RETURN_THROWS();
+			case 16:
+				zend_value_error("Offset not contained in string");
+				RETURN_THROWS();
+			default:
+				zend_value_error("Unknown error in mb_strripos");
+				RETURN_THROWS();
+		}
 		RETVAL_FALSE;
 	}
 }
@@ -2190,6 +2214,26 @@ PHP_FUNCTION(mb_stripos)
 	if (!mbfl_is_error(n)) {
 		RETVAL_LONG(n);
 	} else {
+		switch (-n) {
+			case 1:
+				/* Returns false */
+				break;
+			case 2:
+				zend_value_error("Needle has not positive length");
+				RETURN_THROWS();
+			case 4:
+				zend_value_error("Unknown encoding or conversion error");
+				RETURN_THROWS();
+			case 8:
+				zend_value_error("Argument is empty");
+				RETURN_THROWS();
+			case 16:
+				zend_value_error("Offset not contained in string");
+				RETURN_THROWS();
+			default:
+				zend_value_error("Unknown error in mb_strripos");
+				RETURN_THROWS();
+		}
 		RETVAL_FALSE;
 	}
 }
@@ -2213,6 +2257,26 @@ PHP_FUNCTION(mb_strripos)
 	if (!mbfl_is_error(n)) {
 		RETVAL_LONG(n);
 	} else {
+		switch (-n) {
+			case 1:
+				/* Returns false */
+				break;
+			case 2:
+				zend_value_error("Needle has not positive length");
+				RETURN_THROWS();
+			case 4:
+				zend_value_error("Unknown encoding or conversion error");
+				RETURN_THROWS();
+			case 8:
+				zend_value_error("Argument is empty");
+				RETURN_THROWS();
+			case 16:
+				zend_value_error("Offset not contained in string");
+				RETURN_THROWS();
+			default:
+				zend_value_error("Unknown error in mb_strripos");
+				RETURN_THROWS();
+		}
 		RETVAL_FALSE;
 	}
 }