Skip to content

Commit 64468d1

Browse files
committed
Remove convert_cyr_string() function
1 parent b63c625 commit 64468d1

12 files changed

+2
-590
lines changed

ext/opcache/Optimizer/zend_func_info.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ static const func_info_t func_infos[] = {
275275
#endif
276276
F1("quoted_printable_decode", MAY_BE_STRING),
277277
F1("quoted_printable_encode", MAY_BE_STRING),
278-
F1("convert_cyr_string", MAY_BE_STRING),
279278
F1("get_current_user", MAY_BE_STRING),
280279
F1("get_cfg_var", MAY_BE_FALSE | MAY_BE_STRING | MAY_BE_ARRAY | MAY_BE_ARRAY_KEY_ANY | MAY_BE_ARRAY_OF_STRING | MAY_BE_ARRAY_OF_ARRAY),
281280
F0("get_magic_quotes_gpc", MAY_BE_FALSE),

ext/standard/basic_functions.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1135,7 +1135,6 @@ static const zend_function_entry basic_functions[] = { /* {{{ */
11351135

11361136
PHP_FE(quoted_printable_decode, arginfo_quoted_printable_decode)
11371137
PHP_FE(quoted_printable_encode, arginfo_quoted_printable_encode)
1138-
PHP_DEP_FE(convert_cyr_string, arginfo_convert_cyr_string)
11391138
PHP_FE(get_current_user, arginfo_get_current_user)
11401139
PHP_FE(set_time_limit, arginfo_set_time_limit)
11411140
PHP_FE(header_register_callback, arginfo_header_register_callback)

ext/standard/basic_functions.stub.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,10 +385,6 @@ function crc32(string $str): int {}
385385

386386
function crypt(string $str, string $salt = UNKNOWN): string {}
387387

388-
/* cyr_convert.c */
389-
390-
function convert_cyr_string(string $str, string $from, string $to): string {}
391-
392388
/* datetime.c */
393389

394390
#if HAVE_STRPTIME

ext/standard/basic_functions_arginfo.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -598,12 +598,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_crypt, 0, 1, IS_STRING, 0)
598598
ZEND_ARG_TYPE_INFO(0, salt, IS_STRING, 0)
599599
ZEND_END_ARG_INFO()
600600

601-
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_convert_cyr_string, 0, 3, IS_STRING, 0)
602-
ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
603-
ZEND_ARG_TYPE_INFO(0, from, IS_STRING, 0)
604-
ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0)
605-
ZEND_END_ARG_INFO()
606-
607601
#if HAVE_STRPTIME
608602
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strptime, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE)
609603
ZEND_ARG_TYPE_INFO(0, timestamp, IS_STRING, 0)

ext/standard/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ dnl
485485
dnl Setup extension sources
486486
dnl
487487
PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \
488-
cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
488+
datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \
489489
flock_compat.c formatted_print.c fsock.c head.c html.c image.c \
490490
info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \
491491
microtime.c pack.c pageinfo.c quot_print.c rand.c mt_rand.c \

ext/standard/config.w32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ADD_FLAG("LIBS_STANDARD", "iphlpapi.lib");
2626
EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
2727
crc32.c crypt.c crypt_freesec.c crypt_blowfish.c crypt_sha256.c \
2828
crypt_sha512.c php_crypt_r.c \
29-
cyr_convert.c datetime.c dir.c dl.c dns.c dns_win32.c exec.c \
29+
datetime.c dir.c dl.c dns.c dns_win32.c exec.c \
3030
file.c filestat.c formatted_print.c fsock.c head.c html.c image.c \
3131
info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c microtime.c \
3232
net.c pack.c pageinfo.c quot_print.c rand.c mt_rand.c soundex.c \

ext/standard/cyr_convert.c

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

ext/standard/cyr_convert.h

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

ext/standard/php_standard.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
#include "microtime.h"
3636
#include "url.h"
3737
#include "pageinfo.h"
38-
#include "cyr_convert.h"
3938
#include "php_link.h"
4039
#include "fsock.h"
4140
#include "php_image.h"

0 commit comments

Comments
 (0)