Skip to content

Commit 071e4e5

Browse files
committed
Remove hebrevc() function
1 parent 64a88de commit 071e4e5

File tree

7 files changed

+4
-84
lines changed

7 files changed

+4
-84
lines changed

ext/opcache/Optimizer/zend_func_info.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ static const func_info_t func_infos[] = {
164164
F0("strripos", MAY_BE_FALSE | MAY_BE_LONG),
165165
F1("strrev", MAY_BE_STRING),
166166
F1("hebrev", MAY_BE_STRING),
167-
F1("hebrevc", MAY_BE_STRING),
168167
FN("nl2br", MAY_BE_STRING),
169168
F1("basename", MAY_BE_STRING),
170169
F1("dirname", MAY_BE_NULL | MAY_BE_STRING),

ext/standard/basic_functions.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -914,7 +914,6 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
914914
PHP_FE(strripos, arginfo_strripos)
915915
PHP_FE(strrev, arginfo_strrev)
916916
PHP_FE(hebrev, arginfo_hebrev)
917-
PHP_DEP_FE(hebrevc, arginfo_hebrevc)
918917
PHP_FE(nl2br, arginfo_nl2br)
919918
PHP_FE(basename, arginfo_basename)
920919
PHP_FE(dirname, arginfo_dirname)

ext/standard/basic_functions.stub.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,8 +636,6 @@ function str_ireplace($search, $replace, $subject, &$replace_count = UNKNOWN): s
636636

637637
function hebrev(string $str, int $max_chars_per_line = 0): string {}
638638

639-
function hebrevc(string $str, int $max_chars_per_line = 0): string {}
640-
641639
function nl2br(string $str, bool $is_xhtml = true): string {}
642640

643641
/** @param mixed $allowable_tags */

ext/standard/basic_functions_arginfo.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -981,8 +981,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_hebrev, 0, 1, IS_STRING, 0)
981981
ZEND_ARG_TYPE_INFO(0, max_chars_per_line, IS_LONG, 0)
982982
ZEND_END_ARG_INFO()
983983

984-
#define arginfo_hebrevc arginfo_hebrev
985-
986984
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_nl2br, 0, 1, IS_STRING, 0)
987985
ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
988986
ZEND_ARG_TYPE_INFO(0, is_xhtml, _IS_BOOL, 0)

ext/standard/php_string.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ PHP_FUNCTION(ucwords);
5252
PHP_FUNCTION(strtr);
5353
PHP_FUNCTION(strrev);
5454
PHP_FUNCTION(hebrev);
55-
PHP_FUNCTION(hebrevc);
5655
PHP_FUNCTION(user_sprintf);
5756
PHP_FUNCTION(user_printf);
5857
PHP_FUNCTION(vprintf);

ext/standard/string.c

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4384,12 +4384,9 @@ PHP_FUNCTION(str_ireplace)
43844384
}
43854385
/* }}} */
43864386

4387-
/* {{{ php_hebrev
4388-
*
4389-
* Converts Logical Hebrew text (Hebrew Windows style) to Visual text
4390-
* Cheers/complaints/flames - Zeev Suraski <[email protected]>
4391-
*/
4392-
static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS, int convert_newlines)
4387+
/* {{{ proto string hebrev(string str [, int max_chars_per_line])
4388+
Converts logical Hebrew text to visual text */
4389+
PHP_FUNCTION(hebrev)
43934390
{
43944391
char *str, *heb_str, *target;
43954392
const char *tmp;
@@ -4549,28 +4546,7 @@ static void php_hebrev(INTERNAL_FUNCTION_PARAMETERS, int convert_newlines)
45494546
}
45504547
efree(heb_str);
45514548

4552-
if (convert_newlines) {
4553-
RETVAL_STR(php_char_to_str_ex(broken_str, '\n', "<br />\n", 7, 1, NULL));
4554-
zend_string_release_ex(broken_str, 0);
4555-
} else {
4556-
RETURN_NEW_STR(broken_str);
4557-
}
4558-
}
4559-
/* }}} */
4560-
4561-
/* {{{ proto string hebrev(string str [, int max_chars_per_line])
4562-
Converts logical Hebrew text to visual text */
4563-
PHP_FUNCTION(hebrev)
4564-
{
4565-
php_hebrev(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
4566-
}
4567-
/* }}} */
4568-
4569-
/* {{{ proto string hebrevc(string str [, int max_chars_per_line])
4570-
Converts logical Hebrew text to visual text with newline conversion */
4571-
PHP_FUNCTION(hebrevc)
4572-
{
4573-
php_hebrev(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
4549+
RETURN_NEW_STR(broken_str);
45744550
}
45754551
/* }}} */
45764552

ext/standard/tests/strings/hebrevc_basic.phpt

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)