From: Máté Kocsis Date: Sun, 17 Nov 2019 20:06:08 +0000 (+0100) Subject: Remove convert_cyr_string() function X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64468d1e3b305e759b3af03477532d2b2595e4f5;p=php Remove convert_cyr_string() function --- diff --git a/ext/opcache/Optimizer/zend_func_info.c b/ext/opcache/Optimizer/zend_func_info.c index b902ac0a47..91e71f4260 100644 --- a/ext/opcache/Optimizer/zend_func_info.c +++ b/ext/opcache/Optimizer/zend_func_info.c @@ -275,7 +275,6 @@ static const func_info_t func_infos[] = { #endif F1("quoted_printable_decode", MAY_BE_STRING), F1("quoted_printable_encode", MAY_BE_STRING), - F1("convert_cyr_string", MAY_BE_STRING), F1("get_current_user", MAY_BE_STRING), 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), F0("get_magic_quotes_gpc", MAY_BE_FALSE), diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 081c704c21..d33a06a9d9 100755 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1135,7 +1135,6 @@ static const zend_function_entry basic_functions[] = { /* {{{ */ PHP_FE(quoted_printable_decode, arginfo_quoted_printable_decode) PHP_FE(quoted_printable_encode, arginfo_quoted_printable_encode) - PHP_DEP_FE(convert_cyr_string, arginfo_convert_cyr_string) PHP_FE(get_current_user, arginfo_get_current_user) PHP_FE(set_time_limit, arginfo_set_time_limit) PHP_FE(header_register_callback, arginfo_header_register_callback) diff --git a/ext/standard/basic_functions.stub.php b/ext/standard/basic_functions.stub.php index e513799c6f..8bad7b97de 100755 --- a/ext/standard/basic_functions.stub.php +++ b/ext/standard/basic_functions.stub.php @@ -385,10 +385,6 @@ function crc32(string $str): int {} function crypt(string $str, string $salt = UNKNOWN): string {} -/* cyr_convert.c */ - -function convert_cyr_string(string $str, string $from, string $to): string {} - /* datetime.c */ #if HAVE_STRPTIME diff --git a/ext/standard/basic_functions_arginfo.h b/ext/standard/basic_functions_arginfo.h index 52eee58947..7d44774e87 100755 --- a/ext/standard/basic_functions_arginfo.h +++ b/ext/standard/basic_functions_arginfo.h @@ -598,12 +598,6 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_crypt, 0, 1, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, salt, IS_STRING, 0) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_convert_cyr_string, 0, 3, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, from, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, to, IS_STRING, 0) -ZEND_END_ARG_INFO() - #if HAVE_STRPTIME ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strptime, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, timestamp, IS_STRING, 0) diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index caf2e99e43..854f885cf5 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -485,7 +485,7 @@ dnl dnl Setup extension sources dnl PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ - cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ + datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ microtime.c pack.c pageinfo.c quot_print.c rand.c mt_rand.c \ diff --git a/ext/standard/config.w32 b/ext/standard/config.w32 index 16238f800e..a5737ea853 100644 --- a/ext/standard/config.w32 +++ b/ext/standard/config.w32 @@ -26,7 +26,7 @@ ADD_FLAG("LIBS_STANDARD", "iphlpapi.lib"); EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \ crc32.c crypt.c crypt_freesec.c crypt_blowfish.c crypt_sha256.c \ crypt_sha512.c php_crypt_r.c \ - cyr_convert.c datetime.c dir.c dl.c dns.c dns_win32.c exec.c \ + datetime.c dir.c dl.c dns.c dns_win32.c exec.c \ file.c filestat.c formatted_print.c fsock.c head.c html.c image.c \ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c microtime.c \ net.c pack.c pageinfo.c quot_print.c rand.c mt_rand.c soundex.c \ diff --git a/ext/standard/cyr_convert.c b/ext/standard/cyr_convert.c deleted file mode 100644 index 8f0fa538dd..0000000000 --- a/ext/standard/cyr_convert.c +++ /dev/null @@ -1,284 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Kirill Maximov | - +----------------------------------------------------------------------+ - */ - -#include - -#ifdef HAVE_UNISTD_H -#include -#endif -#include -#include - -#include "php.h" -#include "cyr_convert.h" - -#include - -/***************************************************************************** -* This is codetables for different Cyrillic charsets (relative to koi8-r). -* Each table contains data for 128-255 symbols from ASCII table. -* First 256 symbols are for conversion from koi8-r to corresponding charset, -* second 256 symbols are for reverse conversion, from charset to koi8-r. -* -* Here we have the following tables: -* _cyr_win1251 - for windows-1251 charset -* _cyr_iso88595 - for iso8859-5 charset -* _cyr_cp866 - for x-cp866 charset -* _cyr_mac - for x-mac-cyrillic charset -* -*****************************************************************************/ - -typedef unsigned char _cyr_charset_table[512]; - -/* {{{ static const _cyr_charset_table _cyr_win1251 - */ -static const _cyr_charset_table _cyr_win1251 = { -0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, -32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, -48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, -64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, -80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, -96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, -112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, -46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46, -46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46, -154,174,190,46,159,189,46,46,179,191,180,157,46,46,156,183, -46,46,182,166,173,46,46,158,163,152,164,155,46,46,46,167, -225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240, -242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241, -193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208, -210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209, -0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, -32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, -48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, -64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, -80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, -96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, -112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,184,186,32,179,191,32,32,32,32,32,180,162,32, -32,32,32,168,170,32,178,175,32,32,32,32,32,165,161,169, -254,224,225,246,228,229,244,227,245,232,233,234,235,236,237,238, -239,255,240,241,242,243,230,226,252,251,231,248,253,249,247,250, -222,192,193,214,196,197,212,195,213,200,201,202,203,204,205,206, -207,223,208,209,210,211,198,194,220,219,199,216,221,217,215,218, -}, -_cyr_cp866 = { -0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, -32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, -48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, -64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, -80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, -96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, -112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, -225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240, -242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241, -193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208, -35,35,35,124,124,124,124,43,43,124,124,43,43,43,43,43, -43,45,45,124,45,43,124,124,43,43,45,45,124,45,43,45, -45,45,45,43,43,43,43,43,43,43,43,35,35,124,124,35, -210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209, -179,163,180,164,183,167,190,174,32,149,158,32,152,159,148,154, -0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, -32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, -48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, -64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, -80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, -96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, -112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -205,186,213,241,243,201,32,245,187,212,211,200,190,32,247,198, -199,204,181,240,242,185,32,244,203,207,208,202,216,32,246,32, -238,160,161,230,164,165,228,163,229,168,169,170,171,172,173,174, -175,239,224,225,226,227,166,162,236,235,167,232,237,233,231,234, -158,128,129,150,132,133,148,131,149,136,137,138,139,140,141,142, -143,159,144,145,146,147,134,130,156,155,135,152,157,153,151,154, -}, -_cyr_iso88595 = { -0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, -32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, -48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, -64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, -80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, -96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, -112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,179,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240, -242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241, -193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208, -210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,209, -32,163,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, -32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, -48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, -64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, -80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, -96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, -112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,241,32,32,32,32,32,32,32,32,32,32,32,32, -32,32,32,161,32,32,32,32,32,32,32,32,32,32,32,32, -238,208,209,230,212,213,228,211,229,216,217,218,219,220,221,222, -223,239,224,225,226,227,214,210,236,235,215,232,237,233,231,234, -206,176,177,198,180,181,196,179,197,184,185,186,187,188,189,190, -191,207,192,193,194,195,182,178,204,203,183,200,205,201,199,202, -}, -_cyr_mac = { -0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, -32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, -48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, -64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, -80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, -96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, -112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, -225,226,247,231,228,229,246,250,233,234,235,236,237,238,239,240, -242,243,244,245,230,232,227,254,251,253,255,249,248,252,224,241, -160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175, -176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191, -128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143, -144,145,146,147,148,149,150,151,152,153,154,155,156,179,163,209, -193,194,215,199,196,197,214,218,201,202,203,204,205,206,207,208, -210,211,212,213,198,200,195,222,219,221,223,217,216,220,192,255, -0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15, -16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31, -32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47, -48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63, -64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79, -80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95, -96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111, -112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127, -192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207, -208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223, -160,161,162,222,164,165,166,167,168,169,170,171,172,173,174,175, -176,177,178,221,180,181,182,183,184,185,186,187,188,189,190,191, -254,224,225,246,228,229,244,227,245,232,233,234,235,236,237,238, -239,223,240,241,242,243,230,226,252,251,231,248,253,249,247,250, -158,128,129,150,132,133,148,131,149,136,137,138,139,140,141,142, -143,159,144,145,146,147,134,130,156,155,135,152,157,153,151,154, -}; -/* }}} */ - -/* {{{ static char * php_convert_cyr_string(unsigned char *str, int length, char from, char to) -* This is the function that performs real in-place conversion of the string -* between charsets. -* Parameters: -* str - string to be converted -* from,to - one-symbol label of source and destination charset -* The following symbols are used as labels: -* k - koi8-r -* w - windows-1251 -* i - iso8859-5 -* a - x-cp866 -* d - x-cp866 -* m - x-mac-cyrillic -*****************************************************************************/ -static char * php_convert_cyr_string(unsigned char *str, size_t length, char from, char to) -{ - const unsigned char *from_table, *to_table; - unsigned char tmp; - size_t i; - - from_table = NULL; - to_table = NULL; - - switch (toupper((int)(unsigned char)from)) - { - case 'W': - from_table = _cyr_win1251; - break; - case 'A': - case 'D': - from_table = _cyr_cp866; - break; - case 'I': - from_table = _cyr_iso88595; - break; - case 'M': - from_table = _cyr_mac; - break; - case 'K': - break; - default: - php_error_docref(NULL, E_WARNING, "Unknown source charset: %c", from); - break; - } - - switch (toupper((int)(unsigned char)to)) - { - case 'W': - to_table = _cyr_win1251; - break; - case 'A': - case 'D': - to_table = _cyr_cp866; - break; - case 'I': - to_table = _cyr_iso88595; - break; - case 'M': - to_table = _cyr_mac; - break; - case 'K': - break; - default: - php_error_docref(NULL, E_WARNING, "Unknown destination charset: %c", to); - break; - } - - - if (!str) - return (char *)str; - - for (i = 0; i < length; i++) { - tmp = (from_table == NULL)? str[i] : from_table[ str[i] ]; - str[i] = (to_table == NULL) ? tmp : to_table[tmp + 256]; - } - return (char *)str; -} -/* }}} */ - -/* {{{ proto string convert_cyr_string(string str, string from, string to) - Convert from one Cyrillic character set to another */ -PHP_FUNCTION(convert_cyr_string) -{ - char *input, *fr_cs, *to_cs; - size_t input_len, fr_cs_len, to_cs_len; - zend_string *str; - - ZEND_PARSE_PARAMETERS_START(3, 3) - Z_PARAM_STRING(input, input_len) - Z_PARAM_STRING(fr_cs, fr_cs_len) - Z_PARAM_STRING(to_cs, to_cs_len) - ZEND_PARSE_PARAMETERS_END(); - - str = zend_string_init(input, input_len, 0); - - php_convert_cyr_string((unsigned char *) ZSTR_VAL(str), ZSTR_LEN(str), fr_cs[0], to_cs[0]); - RETVAL_NEW_STR(str); -} -/* }}} */ diff --git a/ext/standard/cyr_convert.h b/ext/standard/cyr_convert.h deleted file mode 100644 index edbe46b46d..0000000000 --- a/ext/standard/cyr_convert.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - +----------------------------------------------------------------------+ - | Copyright (c) The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Kirill Maximov | - +----------------------------------------------------------------------+ -*/ - -#ifndef CYR_CONVERT_H -#define CYR_CONVERT_H - -PHP_FUNCTION(convert_cyr_string); - -#endif /* CYR_CONVERT_H */ diff --git a/ext/standard/php_standard.h b/ext/standard/php_standard.h index 54375c0739..21926d316f 100644 --- a/ext/standard/php_standard.h +++ b/ext/standard/php_standard.h @@ -35,7 +35,6 @@ #include "microtime.h" #include "url.h" #include "pageinfo.h" -#include "cyr_convert.h" #include "php_link.h" #include "fsock.h" #include "php_image.h" diff --git a/ext/standard/tests/strings/convert_cyr_string.phpt b/ext/standard/tests/strings/convert_cyr_string.phpt deleted file mode 100644 index 3bbde00cf1..0000000000 --- a/ext/standard/tests/strings/convert_cyr_string.phpt +++ /dev/null @@ -1,50 +0,0 @@ ---TEST-- -basic convert_cyr_string() tests ---FILE-- - ---EXPECTF-- -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d - -Warning: convert_cyr_string(): Unknown source charset: in %s on line %d - -Warning: convert_cyr_string(): Unknown destination charset: in %s on line %d -string(0) "" - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d - -Warning: convert_cyr_string(): Unknown source charset: q in %s on line %d -string(6) "[[[[[[" - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d -string(6) "[[[[[[" - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d -string(6) "[[[[[[" - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d -string(6) "[[[[[[" - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d -string(6) "[[[[[[" - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d - -Warning: convert_cyr_string(): Unknown destination charset: q in %s on line %d -string(6) "[[[[[[" - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d -string(0) "" -Done diff --git a/ext/standard/tests/strings/convert_cyr_string_basic.phpt b/ext/standard/tests/strings/convert_cyr_string_basic.phpt deleted file mode 100644 index 110dccdc1f..0000000000 --- a/ext/standard/tests/strings/convert_cyr_string_basic.phpt +++ /dev/null @@ -1,167 +0,0 @@ ---TEST-- -Test convert_cyr_string() function : basic functionality ---FILE-- - ---EXPECTF-- -*** Testing convert_cyr_string() : basic functionality *** - --- First try some simple English text -- - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d -string(102) "436f6e766572742066726f6d206f6e6520437972696c6c6963206368617261637465722073657420746f20616e6f746865722e" - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d -string(102) "436f6e766572742066726f6d206f6e6520437972696c6c6963206368617261637465722073657420746f20616e6f746865722e" - --- Now try some of characters in 128-255 range -- -128: 2e -129: 2e -130: 2e -131: 2e -132: 2e -133: 2e -134: 2e -135: 2e -136: 2e -137: 2e -138: 2e -139: 2e -140: 2e -141: 2e -142: 2e -143: 2e -144: 2e -145: 2e -146: 2e -147: 2e -148: 2e -149: 2e -150: 2e -151: 2e -152: 2e -153: 2e -154: 2e -155: 2e -156: 2e -157: 2e -158: 2e -159: 2e -160: 9a -161: ae -162: be -163: 2e -164: 9f -165: bd -166: 2e -167: 2e -168: b3 -169: bf -170: b4 -171: 9d -172: 2e -173: 2e -174: 9c -175: b7 -176: 2e -177: 2e -178: b6 -179: a6 -180: ad -181: 2e -182: 2e -183: 9e -184: a3 -185: 98 -186: a4 -187: 9b -188: 2e -189: 2e -190: 2e -191: a7 -192: e1 -193: e2 -194: f7 -195: e7 -196: e4 -197: e5 -198: f6 -199: fa -200: e9 -201: ea -202: eb -203: ec -204: ed -205: ee -206: ef -207: f0 -208: f2 -209: f3 -210: f4 -211: f5 -212: e6 -213: e8 -214: e3 -215: fe -216: fb -217: fd -218: ff -219: f9 -220: f8 -221: fc -222: e0 -223: f1 -224: c1 -225: c2 -226: d7 -227: c7 -228: c4 -229: c5 -230: d6 -231: da -232: c9 -233: ca -234: cb -235: cc -236: cd -237: ce -238: cf -239: d0 -240: d2 -241: d3 -242: d4 -243: d5 -244: c6 -245: c8 -246: c3 -247: de -248: db -249: dd -250: df -251: d9 -252: d8 -253: dc -254: c0 -255: d1 diff --git a/ext/standard/tests/strings/convert_cyr_string_error.phpt b/ext/standard/tests/strings/convert_cyr_string_error.phpt deleted file mode 100644 index 393a778a30..0000000000 --- a/ext/standard/tests/strings/convert_cyr_string_error.phpt +++ /dev/null @@ -1,52 +0,0 @@ ---TEST-- -Test convert_cyr_string() function : error conditions ---FILE-- -", "?")) ); - -?> ---EXPECTF-- -*** Testing convert_cyr_string() : error conditions *** - --- Testing convert_cyr_string() function with invalid 'from' character set -- - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d - -Warning: convert_cyr_string(): Unknown source charset: ? in %s on line %d -string(10) "68656c6c6f" - --- Testing convert_cyr_string() function with invalid 'to' character set -- - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d - -Warning: convert_cyr_string(): Unknown destination charset: ? in %s on line %d -string(10) "68656c6c6f" - --- Testing convert_cyr_string() function with invalid 'from' and 'to' character set -- - -Deprecated: Function convert_cyr_string() is deprecated in %s on line %d - -Warning: convert_cyr_string(): Unknown source charset: > in %s on line %d - -Warning: convert_cyr_string(): Unknown destination charset: ? in %s on line %d -string(10) "68656c6c6f"