Add frameless handlers for strstr

Author: iluuu1994

Zend/zend_string.h

@@ -649,5 +649,7 @@ extern ZEND_FRAMELESS_FUNCTION(strpos, 2);
 extern ZEND_FRAMELESS_FUNCTION(strpos, 3);
 extern ZEND_FRAMELESS_FUNCTION(substr, 2);
 extern ZEND_FRAMELESS_FUNCTION(substr, 3);
+extern ZEND_FRAMELESS_FUNCTION(strstr, 2);
+extern ZEND_FRAMELESS_FUNCTION(strstr, 3);
 
 #endif /* ZEND_STRING_H */

ext/standard/basic_functions.stub.php

@@ -2379,6 +2379,8 @@ function stristr(string $haystack, string $needle, bool $before_needle = false):
 /**
  * @compile-time-eval
  * @refcount 1
+ * @frameless-function {"arity": 2}
+ * @frameless-function {"arity": 3}
  */
 function strstr(string $haystack, string $needle, bool $before_needle = false): string|false {}
 

ext/standard/basic_functions_arginfo.h

@@ -1715,20 +1715,10 @@ PHP_FUNCTION(stristr)
 }
 /* }}} */
 
-/* {{{ Finds first occurrence of a string within another */
-PHP_FUNCTION(strstr)
+static inline void _zend_strstr(zval *return_value, zend_string *haystack, zend_string *needle, bool part)
 {
-	zend_string *haystack, *needle;
 	const char *found = NULL;
 	zend_long found_offset;
-	bool part = 0;
-
-	ZEND_PARSE_PARAMETERS_START(2, 3)
-		Z_PARAM_STR(haystack)
-		Z_PARAM_STR(needle)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_BOOL(part)
-	ZEND_PARSE_PARAMETERS_END();
 
 	found = php_memnstr(ZSTR_VAL(haystack), ZSTR_VAL(needle), ZSTR_LEN(needle), ZSTR_VAL(haystack) + ZSTR_LEN(haystack));
 
@@ -1741,8 +1731,56 @@ PHP_FUNCTION(strstr)
 	}
 	RETURN_STRINGL(found, ZSTR_LEN(haystack) - found_offset);
 }
+
+/* {{{ Finds first occurrence of a string within another */
+PHP_FUNCTION(strstr)
+{
+	zend_string *haystack, *needle;
+	bool part = 0;
+
+	ZEND_PARSE_PARAMETERS_START(2, 3)
+		Z_PARAM_STR(haystack)
+		Z_PARAM_STR(needle)
+		Z_PARAM_OPTIONAL
+		Z_PARAM_BOOL(part)
+	ZEND_PARSE_PARAMETERS_END();
+
+	_zend_strstr(return_value, haystack, needle, part);
+}
 /* }}} */
 
+ZEND_FRAMELESS_FUNCTION(strstr, 2)
+{
+	zval haystack_tmp, needle_tmp;
+	zend_string *haystack, *needle;
+
+	Z_FLF_PARAM_STR(1, haystack, haystack_tmp);
+	Z_FLF_PARAM_STR(2, needle, needle_tmp);
+
+	_zend_strstr(return_value, haystack, needle, /* part */ false);
+
+flf_clean:
+	Z_FLF_PARAM_FREE_STR(1, haystack_tmp);
+	Z_FLF_PARAM_FREE_STR(2, needle_tmp);
+}
+
+ZEND_FRAMELESS_FUNCTION(strstr, 3)
+{
+	zval haystack_tmp, needle_tmp;
+	zend_string *haystack, *needle;
+	bool part;
+
+	Z_FLF_PARAM_STR(1, haystack, haystack_tmp);
+	Z_FLF_PARAM_STR(2, needle, needle_tmp);
+	Z_FLF_PARAM_BOOL(3, part);
+
+	_zend_strstr(return_value, haystack, needle, part);
+
+flf_clean:
+	Z_FLF_PARAM_FREE_STR(1, haystack_tmp);
+	Z_FLF_PARAM_FREE_STR(2, needle_tmp);
+}
+
 /* {{{ Checks if a string contains another */
 PHP_FUNCTION(str_contains)
 {