Patch add str begins and ends

ext/mbstring/mbstring.c

@@ -260,6 +260,30 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strripos, 0, 0, 2)
 	ZEND_ARG_INFO(0, encoding)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_str_starts_with, 0, 0, 2)
+    ZEND_ARG_INFO(0, haystack)
+    ZEND_ARG_INFO(0, needle)
+    ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_str_starts_with_ci, 0, 0, 2)
+    ZEND_ARG_INFO(0, haystack)
+    ZEND_ARG_INFO(0, needle)
+    ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_str_ends_with, 0, 0, 2)
+    ZEND_ARG_INFO(0, haystack)
+    ZEND_ARG_INFO(0, needle)
+    ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_str_ends_with_ci, 0, 0, 2)
+    ZEND_ARG_INFO(0, haystack)
+    ZEND_ARG_INFO(0, needle)
+    ZEND_ARG_INFO(0, encoding)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_mb_strstr, 0, 0, 2)
 	ZEND_ARG_INFO(0, haystack)
 	ZEND_ARG_INFO(0, needle)
@@ -530,6 +554,10 @@ static const zend_function_entry mbstring_functions[] = {
 	PHP_FE(mb_strrpos,				arginfo_mb_strrpos)
 	PHP_FE(mb_stripos,				arginfo_mb_stripos)
 	PHP_FE(mb_strripos,				arginfo_mb_strripos)
+    PHP_FE(mb_str_starts_with,      arginfo_mb_str_starts_with)
+    PHP_FE(mb_str_starts_with_ci,   arginfo_mb_str_starts_with_ci)
+    PHP_FE(mb_str_ends_with,        arginfo_mb_str_ends_with)
+    PHP_FE(mb_str_ends_with_ci,     arginfo_mb_str_ends_with_ci)
 	PHP_FE(mb_strstr,				arginfo_mb_strstr)
 	PHP_FE(mb_strrchr,				arginfo_mb_strrchr)
 	PHP_FE(mb_stristr,				arginfo_mb_stristr)
@@ -2581,6 +2609,192 @@ PHP_FUNCTION(mb_strripos)
 }
 /* }}} */
 
+/* {{{ proto boolean mb_str_starts_with(string haystack, string needle [, string encoding])
+   Checks if haystack starts with needle */
+PHP_FUNCTION(mb_str_starts_with)
+{
+    mbfl_string haystack, needle;
+    zend_string *enc_name = NULL;
+    size_t n;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|S", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &enc_name) == FAILURE) {
+        return;
+    }
+
+	haystack.no_language = needle.no_language = MBSTRG(language);
+	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
+    if (!haystack.encoding) {
+        RETURN_FALSE;
+    }
+
+    if (needle.len == 0) {
+        RETURN_BOOL(1);
+    }
+
+    n = mbfl_strpos(&haystack, &needle, 0, 0);
+    if (!mbfl_is_error(n)) {
+        if (n == 0) {
+            RETURN_BOOL(1);
+        } else {
+            RETURN_BOOL(0);
+        }
+    } else {
+        switch (-n) {
+            case 1:
+                break;
+            case 4:
+                php_error_docref(NULL, E_WARNING, "Unknown encoding or conversion error");
+                break;
+            case 8:
+                php_error_docref(NULL, E_NOTICE, "Argument is empty");
+                break;
+            default:
+                php_error_docref(NULL, E_WARNING, "Unknown error in mb_strpos");
+                break;
+        }
+        RETURN_BOOL(0);
+    }
+}
+/* }}} */
+
+/* {{{ proto boolean mb_str_starts_with_ci(string haystack, string needle. [, string encoding])
+   Checks if haystack starts with needle, case insensitive */
+PHP_FUNCTION(mb_str_starts_with_ci)
+{
+    mbfl_string haystack, needle;
+    zend_string *enc_name = NULL;
+    size_t n;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|S", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &enc_name) == FAILURE) {
+        return;
+    }
+
+	haystack.no_language = needle.no_language = MBSTRG(language);
+	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
+    if (!haystack.encoding) {
+        RETURN_FALSE;
+    }
+
+    if (needle.len == 0) {
+        RETURN_BOOL(1);
+    }
+
+    n = php_mb_stripos(0, (char *)haystack.val, haystack.len, (char *)needle.val, needle.len, 0, enc_name);
+    if (!mbfl_is_error(n)) {
+        if (n == 0) {
+            RETURN_BOOL(1);
+        } else {
+            RETURN_BOOL(0);
+        }
+    } else {
+        RETVAL_FALSE;
+    }
+}
+/* }}} */
+
+/* {{{ proto boolean mb_str_ends_with(string haystack, string needle [, string encoding])
+   Checks if haystack ends with needle */
+PHP_FUNCTION(mb_str_ends_with)
+{
+    mbfl_string haystack, needle;
+    zend_string *enc_name = NULL;
+    size_t n;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|S", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &enc_name) == FAILURE) {
+        return;
+    }
+
+	haystack.no_language = needle.no_language = MBSTRG(language);
+	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
+    if (!haystack.encoding) {
+        RETURN_FALSE;
+    }
+
+    if (needle.len == 0) {
+        RETURN_BOOL(1);
+    }
+
+	if (needle.len > haystack.len) {
+		RETURN_BOOL(0);	
+	}
+
+    mbfl_string haystack_tail;
+    haystack_tail.encoding = haystack.encoding;
+    haystack_tail.no_language = haystack.no_language;
+    unsigned char* haystack_tail_val = haystack.val + sizeof(char) * (haystack.len - needle.len);
+    haystack_tail.val = haystack_tail_val;
+    haystack_tail.len = needle.len;
+
+    n = mbfl_strpos(&haystack_tail, &needle, 0, 0);
+    if (!mbfl_is_error(n) && n == 0) {
+        RETURN_BOOL(1);
+    } else if (!mbfl_is_error(n)) {
+        RETURN_BOOL(0);
+    } else {
+        switch (-n) {
+            case 1:
+                break;
+            case 4:
+                php_error_docref(NULL, E_WARNING, "Unknown encoding or conversion error");
+                break;
+            case 8:
+                php_error_docref(NULL, E_NOTICE, "Argument is empty");
+                break;
+			case 16:
+				php_error_docref(NULL, E_WARNING, "Unknown needle, haystack error");
+				break;
+            default:
+                php_error_docref(NULL, E_WARNING, "Unknown error in mb_strpos");
+                break;
+        }
+        RETURN_BOOL(0);
+    }
+}
+/* }}} */
+
+/* {{{ proto boolean mb_str_ends_with_ci(string haystack, string needle. [, string encoding])
+   Checks if haystack ends with needle, case insensitive */
+PHP_FUNCTION(mb_str_ends_with_ci)
+{
+    mbfl_string haystack, needle;
+    zend_string *enc_name = NULL;
+    size_t n;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ss|S", (char **)&haystack.val, &haystack.len, (char **)&needle.val, &needle.len, &enc_name) == FAILURE) {
+        return;
+    }
+
+	haystack.no_language = needle.no_language = MBSTRG(language);
+	haystack.encoding = needle.encoding = php_mb_get_encoding(enc_name);
+    if (!haystack.encoding) {
+        RETURN_FALSE;
+    }
+
+    if (needle.len == 0) {
+        RETURN_BOOL(1);
+    }
+
+    mbfl_string haystack_tail;
+    haystack_tail.encoding = haystack.encoding;
+    haystack_tail.no_language = haystack.no_language;
+    unsigned char* haystack_tail_val = haystack.val + sizeof(char) * (haystack.len - needle.len);
+    haystack_tail.val = haystack_tail_val;
+    haystack_tail.len = needle.len;
+
+    n = php_mb_stripos(0, (char *)haystack_tail.val, haystack_tail.len, (char *)needle.val, needle.len, 0, enc_name);
+    if (!mbfl_is_error(n)) {
+        if (n == 0) {
+            RETURN_BOOL(1);
+        } else {
+            RETURN_BOOL(0);
+        }
+    } else {
+        RETVAL_FALSE;
+    }
+}
+/* }}} */
+
+
 /* {{{ proto string mb_strstr(string haystack, string needle[, bool part[, string encoding]])
    Finds first occurrence of a string within another */
 PHP_FUNCTION(mb_strstr)

ext/mbstring/mbstring.h

@@ -84,6 +84,10 @@ PHP_FUNCTION(mb_strpos);
 PHP_FUNCTION(mb_strrpos);
 PHP_FUNCTION(mb_stripos);
 PHP_FUNCTION(mb_strripos);
+PHP_FUNCTION(mb_str_starts_with);
+PHP_FUNCTION(mb_str_starts_with_ci);
+PHP_FUNCTION(mb_str_ends_with);
+PHP_FUNCTION(mb_str_ends_with_ci);
 PHP_FUNCTION(mb_strstr);
 PHP_FUNCTION(mb_strrchr);
 PHP_FUNCTION(mb_stristr);

ext/mbstring/tests/mb_str_ends_with.phpt

@@ -0,0 +1,55 @@
+--TEST--
+mb_str_ends_with()
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+--FILE--
+<?php
+ini_set('include_path','.');
+include_once('common.inc');
+
+// Test string
+$euc_jp = '0123この文字列は日本語です。EUC-JPを使っています。0123日本語は面倒臭い。';
+
+// EUC-JP - With encoding parameter
+mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n");
+var_dump(mb_str_ends_with($euc_jp, 'い。', 'EUC-JP'));
+var_dump(mb_str_ends_with($euc_jp, '韓国語', 'EUC-JP'));
+
+// EUC-JP - No encoding parameter
+mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
+var_dump(mb_str_ends_with($euc_jp, 'い。'));
+var_dump(mb_str_ends_with($euc_jp, '韓国語'));
+
+// Basic functionality
+mb_internal_encoding('UTF-8');
+$string_ascii = 'abc def';
+
+// Japanese string in UTF-8
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+var_dump(mb_str_ends_with($string_ascii, 'f', 'ISO-8859-1'));
+var_dump(mb_str_ends_with($string_ascii, 'F', 'ISO-8859-1'));
+var_dump(mb_str_ends_with($string_ascii, 'e', 'ISO-8859-1'));
+var_dump(mb_str_ends_with($string_ascii, 'def'));
+var_dump(mb_str_ends_with($string_ascii, 'de'));
+
+$needle1 = base64_decode('77yZ44CC');
+var_dump(mb_str_ends_with($string_mb, $needle1));
+
+$needle2 = base64_decode("44GT44KT44Gr44Gh44Gv44CB5LiW55WM");
+var_dump(mb_str_ends_with($string_mb, $needle2));
+
+
+?>
+--EXPECT--
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)

ext/mbstring/tests/mb_str_ends_with_ci.phpt

@@ -0,0 +1,53 @@
+--TEST--
+mb_str_ends_with_ci()
+--SKIPIF--
+<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
+--FILE--
+<?php
+ini_set('include_path','.');
+include_once('common.inc');
+
+// Test string
+$euc_jp = '0123この文字列は日本語です。EUC-JPを使っています。0123日本語は面倒臭い。';
+
+// EUC-JP - With encoding parameter
+mb_internal_encoding('UTF-8') or print("mb_internal_encoding() failed\n");
+var_dump(mb_str_ends_with_ci($euc_jp, 'い。', 'EUC-JP'));
+var_dump(mb_str_ends_with_ci($euc_jp, '韓国語', 'EUC-JP'));
+
+// EUC-JP - No encoding parameter
+mb_internal_encoding('EUC-JP')  or print("mb_internal_encoding() failed\n");
+var_dump(mb_str_ends_with_ci($euc_jp, 'い。'));
+var_dump(mb_str_ends_with_ci($euc_jp, '韓国語'));
+
+// Basic functionality
+mb_internal_encoding('UTF-8');
+$string_ascii = 'abc def';
+
+//Japanese string in UTF-8
+$string_mb = base64_decode('5pel5pys6Kqe44OG44Kt44K544OI44Gn44GZ44CCMDEyMzTvvJXvvJbvvJfvvJjvvJnjgII=');
+
+var_dump(mb_str_ends_with_ci($string_ascii, 'F', 'ISO-8859-1'));
+var_dump(mb_str_ends_with_ci($string_ascii, 'e', 'ISO-8859-1'));
+var_dump(mb_str_ends_with_ci($string_ascii, 'DeF'));
+var_dump(mb_str_ends_with_ci($string_ascii, 'de'));
+
+$needle1 = base64_decode('77yZ44CC');
+var_dump(mb_str_ends_with_ci($string_mb, $needle1));
+
+$needle2 = base64_decode("44GT44KT44Gr44Gh44Gv44CB5LiW55WM");
+var_dump(mb_str_ends_with_ci($string_mb, $needle2));
+
+
+?>
+--EXPECT--
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)