- Deprecate ereg

diff --git a/NEWS b/NEWS
index 4bbe7ef96e7f237415f834b5ad64fc0df648fad3..d4f9c9260cceb6ded79eb57a957b55106c8cbb6c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -28,6 +28,7 @@ PHP                                                                        NEWS
   (David Soria Parra)
 
 - Deprecated define_syslog_variables(). (Kalle)
+- Deprecated ereg extension. (Felipe)
 
 - Fixed bug causing the algorithm parameter of mhash() to be modified. (Scott)
 - Fixed invalid calls to free when internal fileinfo magic file is used. (Scott)

diff --git a/ext/ereg/ereg.c b/ext/ereg/ereg.c
index 0e5ed1f767ee462ee47e00940b799481276c0d50..42ca7c57efd283584a9fac74bd493ecf40b0f4c9 100644 (file)
--- a/ext/ereg/ereg.c
+++ b/ext/ereg/ereg.c
@@ -33,36 +33,18 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ereg, 0, 0, 2)
        ZEND_ARG_INFO(1, registers) /* ARRAY_INFO(1, registers, 1) */
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_eregi, 0, 0, 2)
-       ZEND_ARG_INFO(0, pattern)
-       ZEND_ARG_INFO(0, string) 
-       ZEND_ARG_INFO(1, registers) /* ARRAY_INFO(1, registers, 1) */
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO(arginfo_ereg_replace, 0)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, replacement)
        ZEND_ARG_INFO(0, string)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO(arginfo_eregi_replace, 0)
-       ZEND_ARG_INFO(0, pattern)
-       ZEND_ARG_INFO(0, replacement)
-       ZEND_ARG_INFO(0, string)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO_EX(arginfo_split, 0, 0, 2)
        ZEND_ARG_INFO(0, pattern)
        ZEND_ARG_INFO(0, string) 
        ZEND_ARG_INFO(0, limit)  
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_spliti, 0, 0, 2)
-       ZEND_ARG_INFO(0, pattern)
-       ZEND_ARG_INFO(0, string) 
-       ZEND_ARG_INFO(0, limit)  
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO(arginfo_sql_regcase, 0)
        ZEND_ARG_INFO(0, string)
 ZEND_END_ARG_INFO()
@@ -70,13 +52,13 @@ ZEND_END_ARG_INFO()
 
 /* {{{ Function table */
 const zend_function_entry ereg_functions[] = {
-       PHP_FE(ereg,                                            arginfo_ereg)  
-       PHP_FE(ereg_replace,                            arginfo_ereg_replace)
-       PHP_FE(eregi,                                           arginfo_eregi)
-       PHP_FE(eregi_replace,                           arginfo_eregi_replace)   
-       PHP_FE(split,                                           arginfo_split)
-       PHP_FE(spliti,                                          arginfo_spliti)
-       PHP_FE(sql_regcase,                                     arginfo_sql_regcase)
+       PHP_DEP_FE(ereg,                        arginfo_ereg)
+       PHP_DEP_FE(ereg_replace,        arginfo_ereg_replace)
+       PHP_DEP_FE(eregi,                       arginfo_ereg)
+       PHP_DEP_FE(eregi_replace,       arginfo_ereg_replace)
+       PHP_DEP_FE(split,                       arginfo_split)
+       PHP_DEP_FE(spliti,                      arginfo_split)
+       PHP_DEP_FE(sql_regcase,         arginfo_sql_regcase)
        {NULL, NULL, NULL}
 };
 /* }}} */

diff --git a/ext/ereg/tests/001.phpt b/ext/ereg/tests/001.phpt
index 13c50d0d1e45895a0272788365561af33e576cd1..0ba697978c3bd33d1b2ef2bee653c37538869dbf 100644 (file)
--- a/ext/ereg/tests/001.phpt
+++ b/ext/ereg/tests/001.phpt
@@ -3,5 +3,6 @@ RegReplace test 1
 --FILE--
 <?php $a="abc123";
   echo ereg_replace("123","def",$a)?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 abcdef

diff --git a/ext/ereg/tests/002.phpt b/ext/ereg/tests/002.phpt
index abe9e063d8b764255e9cf41b41e5bf925566ce23..6ce12a936a26cd4b4cd239916005d3e14348ddf4 100644 (file)
--- a/ext/ereg/tests/002.phpt
+++ b/ext/ereg/tests/002.phpt
@@ -3,5 +3,6 @@ RegReplace test 2
 --FILE--
 <?php $a="abc123";
   echo ereg_replace("123","",$a)?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 abc

diff --git a/ext/ereg/tests/003.phpt b/ext/ereg/tests/003.phpt
index 4257f0d27e78d5be38b0140d84e2301cea383bf8..5431349fa947e1045d803b8b67c90a0b83b226a8 100644 (file)
--- a/ext/ereg/tests/003.phpt
+++ b/ext/ereg/tests/003.phpt
@@ -4,5 +4,6 @@ ereg_replace single-quote test
 <?php $a="\\'test";
   echo ereg_replace("\\\\'","'",$a)
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 'test

diff --git a/ext/ereg/tests/004.phpt b/ext/ereg/tests/004.phpt
index 3e535c6a9de40b4aad869ac9a33528c8a12fa86e..db16fe14713b5d002e487b6125a72e5b87efe131 100644 (file)
--- a/ext/ereg/tests/004.phpt
+++ b/ext/ereg/tests/004.phpt
@@ -9,6 +9,9 @@ simple ereg test
     echo "ok\n";
   }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg() is deprecated in %s on line %d
 ok
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 ok

diff --git a/ext/ereg/tests/005.phpt b/ext/ereg/tests/005.phpt
index ee9ccc6da4afcb71bd9d22abcec9c2d0b152a2d0..127ede0c494608d416a0d8424c8153fe83bd9baf 100644 (file)
--- a/ext/ereg/tests/005.phpt
+++ b/ext/ereg/tests/005.phpt
@@ -11,7 +11,8 @@ Test Regular expression register support in ereg
   echo $registers[2];
   echo "\n";
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg() is deprecated in %s on line %d
 32
 This is a nice and simple string
 is

diff --git a/ext/ereg/tests/006.phpt b/ext/ereg/tests/006.phpt
index cae349672ed767cfc5b401c90d8295743efab04d..7df88dd3218e6ea710256a704d33b578351a8683 100644 (file)
--- a/ext/ereg/tests/006.phpt
+++ b/ext/ereg/tests/006.phpt
@@ -4,5 +4,6 @@ Test ereg_replace of start-of-line
 <?php $a="This is a nice and simple string";
   echo ereg_replace("^This","That",$a);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 That is a nice and simple string

diff --git a/ext/ereg/tests/007.phpt b/ext/ereg/tests/007.phpt
index beb3cdc159176158d955d96db954cccb6a65e01d..3bbd6551b6d8139dfa7a8f216df4cd4cde56bab2 100644 (file)
--- a/ext/ereg/tests/007.phpt
+++ b/ext/ereg/tests/007.phpt
@@ -6,5 +6,6 @@ Test empty result buffer in reg_replace
        $b=ereg_replace("abcd","",$a);
        echo "strlen(\$b)=".strlen($b);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 strlen($b)=0

diff --git a/ext/ereg/tests/008.phpt b/ext/ereg/tests/008.phpt
index 9a0cedabc5338480e85d721f5daec8ad662ea557..ad34ba397862403f63f4e52cc42170dd2f49fbfc 100644 (file)
--- a/ext/ereg/tests/008.phpt
+++ b/ext/ereg/tests/008.phpt
@@ -4,5 +4,6 @@ Test back-references in regular expressions
 <?php
        echo ereg_replace("([a-z]*)([-=+|]*)([0-9]+)","\\3 \\1 \\2\n","abc+-|=123");
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 123 abc +-|=

diff --git a/ext/ereg/tests/009.phpt b/ext/ereg/tests/009.phpt
index 528606f3c897d5f33bb70b3919a1093c72459fd9..513f31a83e7839b7de35b978300eabb62fdbf8e8 100644 (file)
--- a/ext/ereg/tests/009.phpt
+++ b/ext/ereg/tests/009.phpt
@@ -9,7 +9,8 @@ test");
           echo $a[$i] . "\n";
         }
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function split() is deprecated in %s on line %d
 4
 this
 is

diff --git a/ext/ereg/tests/010.phpt b/ext/ereg/tests/010.phpt
index f6f8909f73d7bde97fd4f56fff32eb346599bfee..52a3e3bb1ce084de60af9eebe50a339fe2b29c03 100644 (file)
--- a/ext/ereg/tests/010.phpt
+++ b/ext/ereg/tests/010.phpt
@@ -3,5 +3,6 @@ Long back references
 --FILE--
 <?php $a="abc122222222223";
   echo ereg_replace("1(2*)3","\\1def\\1",$a)?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 abc2222222222def2222222222

diff --git a/ext/ereg/tests/011.phpt b/ext/ereg/tests/011.phpt
index 65554b302fc6a1bc2ce4d6147045682f0078d251..8bd51b467ace53374b112644b761b19d2aa302e6 100644 (file)
--- a/ext/ereg/tests/011.phpt
+++ b/ext/ereg/tests/011.phpt
@@ -3,5 +3,6 @@
 --FILE--
 <?php $a="abc123";
   echo ereg_replace("123","def\\0ghi",$a)?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 abcdef123ghi

diff --git a/ext/ereg/tests/012.phpt b/ext/ereg/tests/012.phpt
index 88ad5992addf937947582fc8b2ebdbc5549191c1..d54ae01f12aabf6e6d441d3cd86a167c12fcace4 100644 (file)
--- a/ext/ereg/tests/012.phpt
+++ b/ext/ereg/tests/012.phpt
@@ -3,5 +3,6 @@ nonexisting back reference
 --FILE--
 <?php $a="abc123";
   echo ereg_replace("123",'def\1ghi',$a)?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 abcdef\1ghi

diff --git a/ext/ereg/tests/013.phpt b/ext/ereg/tests/013.phpt
index a2d9ee009910e4aba53a8c3fbb6bc7cb3eeb47fe..23f6944ff5ebaddbe47d088f66684d075a90f531 100644 (file)
--- a/ext/ereg/tests/013.phpt
+++ b/ext/ereg/tests/013.phpt
@@ -3,5 +3,6 @@ escapes in replace string
 --FILE--
 <?php $a="abc123";
   echo ereg_replace("123","def\\g\\\\hi\\",$a)?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 abcdef\g\\hi\

diff --git a/ext/ereg/tests/014.phpt b/ext/ereg/tests/014.phpt
index d2a32451a9d94e238bce9b73daaad1d20abe2d3d..ac6880206110a307406eb3c07751d28a35cb468e 100644 (file)
--- a/ext/ereg/tests/014.phpt
+++ b/ext/ereg/tests/014.phpt
@@ -3,5 +3,6 @@ backreferences not replaced recursively
 --FILE--
 <?php $a="a\\2bxc";
   echo ereg_replace("a(.*)b(.*)c","\\1",$a)?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 \2

diff --git a/ext/ereg/tests/015.phpt b/ext/ereg/tests/015.phpt
index c255ddf05bb9fe54907babd2124880271dfbf916..edb8e709c6680557c09b628c1fea4d91bc5dbf8d 100644 (file)
--- a/ext/ereg/tests/015.phpt
+++ b/ext/ereg/tests/015.phpt
@@ -2,5 +2,6 @@
 replace empty matches
 --FILE--
 <?php echo ereg_replace("^","z","abc123")?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 zabc123

diff --git a/ext/ereg/tests/016.phpt b/ext/ereg/tests/016.phpt
index c354ab26fc5f261d82d1fa83896e0683073f0631..93dbda7ee509c3c8bb3b97650e0bd62e1aa09754 100644 (file)
--- a/ext/ereg/tests/016.phpt
+++ b/ext/ereg/tests/016.phpt
@@ -2,5 +2,6 @@
 test backslash handling in regular expressions
 --FILE--
 <?php echo ereg_replace('\?',"abc","?123?")?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 abc123abc

diff --git a/ext/ereg/tests/ereg_basic_001.phpt b/ext/ereg/tests/ereg_basic_001.phpt
index 485b2d26e83c4d61442206d6bb39a33ec1e29d09..e9dad37636e458f5dd5040ec767c6007f36dd000 100644 (file)
--- a/ext/ereg/tests/ereg_basic_001.phpt
+++ b/ext/ereg/tests/ereg_basic_001.phpt
@@ -28,6 +28,8 @@ echo "Done";
 --EXPECTF--
 *** Testing ereg() : basic functionality ***
 --> Pattern: '..(a|b|c)(a|b|c)..'; string: '--- ab ---'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(6)
 array(3) {
   [0]=>
@@ -38,6 +40,8 @@ array(3) {
   string(1) "b"
 }
 --> Pattern: '()'; string: ''
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 array(2) {
   [0]=>
@@ -46,6 +50,8 @@ array(2) {
   bool(false)
 }
 --> Pattern: '()'; string: 'abcdef'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 array(2) {
   [0]=>
@@ -54,12 +60,16 @@ array(2) {
   bool(false)
 }
 --> Pattern: '[x]|[^x]'; string: 'abcdef'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 array(1) {
   [0]=>
   string(1) "a"
 }
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; string: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(15)
 array(6) {
   [0]=>
@@ -76,36 +86,48 @@ array(6) {
   string(3) "ddd"
 }
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; string: '\`^.[$()|*+?{''
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(14)
 array(1) {
   [0]=>
   string(14) "\`^.[$()|*+?{'"
 }
 --> Pattern: '\a'; string: 'a'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 array(1) {
   [0]=>
   string(1) "a"
 }
 --> Pattern: '[0-9][^0-9]'; string: '2a'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(2)
 array(1) {
   [0]=>
   string(2) "2a"
 }
 --> Pattern: '^[[:alnum:]]{62,62}$'; string: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(62)
 array(1) {
   [0]=>
   string(62) "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 }
 --> Pattern: '^[[:digit:]]{5}'; string: '0123456789'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(5)
 array(1) {
   [0]=>
   string(5) "01234"
 }
 --> Pattern: '[[:digit:]]{5}$'; string: '0123456789'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(5)
 array(1) {
   [0]=>
@@ -113,15 +135,19 @@ array(1) {
 }
 --> Pattern: '[[:blank:]]{1,10}'; string: '
        '
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(2)
 array(1) {
   [0]=>
   string(2) "  "
 }
 --> Pattern: '[[:print:]]{3}'; string: ' a '
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(3)
 array(1) {
   [0]=>
   string(3) " a "
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_basic_002.phpt b/ext/ereg/tests/ereg_basic_002.phpt
index 672632fc7de09aed887fd29f89a2edf38eb08be6..75665fb1005c8574d30f77c7fcfea4edd12f05d2 100644 (file)
--- a/ext/ereg/tests/ereg_basic_002.phpt
+++ b/ext/ereg/tests/ereg_basic_002.phpt
@@ -27,30 +27,56 @@ echo "Done";
 --EXPECTF--
 *** Testing ereg() : basic functionality ***
 --> Pattern: '..(a|b|c)(a|b|c)..'; string: '--- ab ---'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '()'; string: ''
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '()'; string: 'abcdef'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[x]|[^x]'; string: 'abcdef'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; string: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; string: '\`^.[$()|*+?{''
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '\a'; string: 'a'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[0-9][^0-9]'; string: '2a'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '^[[:alnum:]]{62,62}$'; string: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '^[[:digit:]]{5}'; string: '0123456789'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[[:digit:]]{5}$'; string: '0123456789'
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[[:blank:]]{1,10}'; string: '
        '
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[[:print:]]{3}'; string: ' a '
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_basic_003.phpt b/ext/ereg/tests/ereg_basic_003.phpt
index 8c14738832180e0344b55ec8fd8893e06d389fc2..0cbe0797b904e6619d4b56fc687ec74b4d6162f6 100644 (file)
--- a/ext/ereg/tests/ereg_basic_003.phpt
+++ b/ext/ereg/tests/ereg_basic_003.phpt
@@ -19,7 +19,10 @@ var_dump(count($regs));
 echo "Done";
 ?>
 --EXPECTF--
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(1)
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(2048)
 int(2049)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_basic_004.phpt b/ext/ereg/tests/ereg_basic_004.phpt
index 1356eaf637d3600cf9dfd333d346a37fb4d7bcf1..20bdf80073095741115949d72b2ceeb26e0ac674 100644 (file)
--- a/ext/ereg/tests/ereg_basic_004.phpt
+++ b/ext/ereg/tests/ereg_basic_004.phpt
@@ -23,11 +23,22 @@ var_dump($regs);
 echo "Done";
 ?>
 --EXPECTF--
+Deprecated: Function ereg() is deprecated in %s on line %d
 bool(false)
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 bool(false)
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 bool(false)
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 bool(false)
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 bool(false)
+
+Deprecated: Function ereg() is deprecated in %s on line %d
 bool(false)
 string(8) "original"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_error_001.phpt b/ext/ereg/tests/ereg_error_001.phpt
index 6232326317a737a8a34ebdeaba39dd167c71f27a..ccb770897d1afc2d5e5d4a54c5f114bfcd6fa57a 100644 (file)
--- a/ext/ereg/tests/ereg_error_001.phpt
+++ b/ext/ereg/tests/ereg_error_001.phpt
@@ -35,11 +35,15 @@ echo "Done";
 
 -- Testing ereg() function with more than expected no. of arguments --
 
-Warning: ereg() expects at most 3 parameters, 4 given in %s on line 21
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing ereg() function with less than expected no. of arguments --
 
-Warning: ereg() expects at least 2 parameters, 1 given in %s on line 26
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 Done

diff --git a/ext/ereg/tests/ereg_error_002.phpt b/ext/ereg/tests/ereg_error_002.phpt
index 61166ee979ab8dfd6fceea282ff7a678e0994b67..707b7317f7391d263923785ed909100b9fe9dad1 100644 (file)
--- a/ext/ereg/tests/ereg_error_002.phpt
+++ b/ext/ereg/tests/ereg_error_002.phpt
@@ -40,49 +40,79 @@ echo "Done";
 --EXPECTF--
 *** Testing ereg() : error conditions ***
 
-Warning: ereg(): REG_EMPTY in %s on line 16
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_EPAREN in %s on line 17
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_EBRACK in %s on line 18
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_EBRACK in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_EPAREN in %s on line 19
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_BADRPT in %s on line 20
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_BADRPT in %s on line 21
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_BADRPT in %s on line 22
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_BADRPT in %s on line 23
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_BADBR in %s on line 24
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_EMPTY in %s on line 25
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_EMPTY in %s on line 26
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_BADBR in %s on line 27
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_ERANGE in %s on line 28
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_ERANGE in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_EESCAPE in %s on line 29
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_EESCAPE in %s on line %d
 bool(false)
 
-Warning: ereg(): REG_ERANGE in %s on line 30
+Deprecated: Function ereg() is deprecated in %s on line %d
+
+Warning: ereg(): REG_ERANGE in %s on line %d
 bool(false)
 string(8) "original"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_replace_basic_001.phpt b/ext/ereg/tests/ereg_replace_basic_001.phpt
index e0a5dfb7b880fb933ea7b75b345fe91858b337d7..66b056ed60e896f47d51212c4c51072acb264ede 100644 (file)
--- a/ext/ereg/tests/ereg_replace_basic_001.phpt
+++ b/ext/ereg/tests/ereg_replace_basic_001.phpt
@@ -29,32 +29,58 @@ echo "Done";
 --EXPECTF--
 *** Testing ereg() : basic functionality ***
 --> Pattern: '..(a|b|c)(a|b|c)..'; match: '--- ab ---'
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(82) "--[this is a replacement]-- this contains some matches --[this is a replacement]--"
 --> Pattern: '()'; match: ''
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(695) "[this is a replacement] [this is a replacement]t[this is a replacement]h[this is a replacement]i[this is a replacement]s[this is a replacement] [this is a replacement]c[this is a replacement]o[this is a replacement]n[this is a replacement]t[this is a replacement]a[this is a replacement]i[this is a replacement]n[this is a replacement]s[this is a replacement] [this is a replacement]s[this is a replacement]o[this is a replacement]m[this is a replacement]e[this is a replacement] [this is a replacement]m[this is a replacement]a[this is a replacement]t[this is a replacement]c[this is a replacement]h[this is a replacement]e[this is a replacement]s[this is a replacement] [this is a replacement]"
 --> Pattern: '()'; match: 'abcdef'
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(983) "[this is a replacement]a[this is a replacement]b[this is a replacement]c[this is a replacement]d[this is a replacement]e[this is a replacement]f[this is a replacement] [this is a replacement]t[this is a replacement]h[this is a replacement]i[this is a replacement]s[this is a replacement] [this is a replacement]c[this is a replacement]o[this is a replacement]n[this is a replacement]t[this is a replacement]a[this is a replacement]i[this is a replacement]n[this is a replacement]s[this is a replacement] [this is a replacement]s[this is a replacement]o[this is a replacement]m[this is a replacement]e[this is a replacement] [this is a replacement]m[this is a replacement]a[this is a replacement]t[this is a replacement]c[this is a replacement]h[this is a replacement]e[this is a replacement]s[this is a replacement] [this is a replacement]a[this is a replacement]b[this is a replacement]c[this is a replacement]d[this is a replacement]e[this is a replacement]f[this is a replacement]"
 --> Pattern: '[x]|[^x]'; match: 'abcdef'
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(920) "[this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement]"
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; match: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(90) "--- [this is a replacement] --- this contains some matches --- [this is a replacement] ---"
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; match: '\`^.[$()|*+?{''
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(74) "[this is a replacement] this contains some matches [this is a replacement]"
 --> Pattern: '\a'; match: 'a'
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(118) "[this is a replacement] this cont[this is a replacement]ins some m[this is a replacement]tches [this is a replacement]"
 --> Pattern: '[0-9][^0-9]'; match: '2a'
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(74) "[this is a replacement] this contains some matches [this is a replacement]"
 --> Pattern: '^[[:alnum:]]{62,62}$'; match: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(152) "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ this contains some matches 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 --> Pattern: '^[[:digit:]]{5}'; match: '0123456789'
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(66) "[this is a replacement]56789 this contains some matches 0123456789"
 --> Pattern: '[[:digit:]]{5}$'; match: '0123456789'
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(66) "0123456789 this contains some matches 01234[this is a replacement]"
 --> Pattern: '[[:blank:]]{1,10}'; match: '
        '
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(163) "
 [this is a replacement]this[this is a replacement]contains[this is a replacement]some[this is a replacement]matches[this is a replacement]
 [this is a replacement]"
 --> Pattern: '[[:print:]]{3}'; match: ' a '
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(254) "[this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement] "
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_replace_basic_002.phpt b/ext/ereg/tests/ereg_replace_basic_002.phpt
index 4ef9c4109ee34b026bda892542abe33af9d144d3..e12612d5adeb8a378a0d0520a1fe89864f582c6d 100644 (file)
--- a/ext/ereg/tests/ereg_replace_basic_002.phpt
+++ b/ext/ereg/tests/ereg_replace_basic_002.phpt
@@ -21,10 +21,21 @@ var_dump(ereg_replace('[:alpha:]', $replacement, 'x'));
 echo "Done";
 ?>
 --EXPECTF--
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(1) "a"
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(1) "0"
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(3) "aaa"
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(2) "ba"
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(2) "ba"
+
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
 string(1) "x"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_replace_error_001.phpt b/ext/ereg/tests/ereg_replace_error_001.phpt
index 8bcc4bfb07b86f4423094efbe44a699bb88e4768..d49d87f9d8e7abdfb3b781335f63d5ab0d0d033e 100644 (file)
--- a/ext/ereg/tests/ereg_replace_error_001.phpt
+++ b/ext/ereg/tests/ereg_replace_error_001.phpt
@@ -32,11 +32,15 @@ echo "Done";
 
 -- Testing ereg_replace() function with more than expected no. of arguments --
 
-Warning: ereg_replace() expects exactly 3 parameters, 4 given in %s on line 17
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace() expects exactly 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing ereg_replace() function with less than expected no. of arguments --
 
-Warning: ereg_replace() expects exactly 3 parameters, 2 given in %s on line 23
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace() expects exactly 3 parameters, 2 given in %s on line %d
 NULL
 Done

diff --git a/ext/ereg/tests/ereg_replace_error_002.phpt b/ext/ereg/tests/ereg_replace_error_002.phpt
index 6e7183c42575685e6722eb04d5d6918c05695b6a..b161a0dcf2d23c9a913a529b30647525a1a11a31 100644 (file)
--- a/ext/ereg/tests/ereg_replace_error_002.phpt
+++ b/ext/ereg/tests/ereg_replace_error_002.phpt
@@ -29,48 +29,78 @@ echo "Done";
 --EXPECTF--
 *** Testing ereg_replace() : bad REs ***
 
-Warning: ereg_replace(): REG_EMPTY in %s on line 9
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_EPAREN in %s on line 10
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_EBRACK in %s on line 11
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_EBRACK in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_EPAREN in %s on line 12
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_BADRPT in %s on line 13
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_BADRPT in %s on line 14
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_BADRPT in %s on line 15
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_BADRPT in %s on line 16
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_BADBR in %s on line 17
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_EMPTY in %s on line 18
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_EMPTY in %s on line 19
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_BADBR in %s on line 20
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_ERANGE in %s on line 21
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_ERANGE in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_EESCAPE in %s on line 22
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_EESCAPE in %s on line %d
 bool(false)
 
-Warning: ereg_replace(): REG_ERANGE in %s on line 23
+Deprecated: Function ereg_replace() is deprecated in %s on line %d
+
+Warning: ereg_replace(): REG_ERANGE in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_replace_variation_001.phpt b/ext/ereg/tests/ereg_replace_variation_001.phpt
index 446ac86e03129c493a72f8ea47131f8a11cfd6b9..ebb1504f637fcb9db8a932a2e22296283bc741ca 100644 (file)
--- a/ext/ereg/tests/ereg_replace_variation_001.phpt
+++ b/ext/ereg/tests/ereg_replace_variation_001.phpt
@@ -85,91 +85,116 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value 12345 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value -2345 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value 10.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value -10.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value 101234567000 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 0.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 8 - Object of class stdClass could not be converted to int, %s(74)
 string(8) "original"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace(): REG_EMPTY, %s(74)
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_replace_variation_002.phpt b/ext/ereg/tests/ereg_replace_variation_002.phpt
index 1032060f71e62a121dcc756b2ca54e1e350eb575..2dd3de9313daa4e5eeb12a1bb5d10710c9d94c8a 100644 (file)
--- a/ext/ereg/tests/ereg_replace_variation_002.phpt
+++ b/ext/ereg/tests/ereg_replace_variation_002.phpt
@@ -85,79 +85,104 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value 12345 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(6) "h9o%21"
 
 Arg value -2345 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%D7o%21"
 
 Arg value 10.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%0Ao%21"
 
 Arg value -10.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%F6o%21"
 
 Arg value 101234567000 
-string(%d) "h%so%21"
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
+string(8) "h%FFo%21"
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value 0.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 8 - Object of class stdClass could not be converted to int, %s(74)
 string(8) "h%01o%21"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "ho%21"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_replace_variation_003.phpt b/ext/ereg/tests/ereg_replace_variation_003.phpt
index 2d86c0db8975efc9b4aba4fa93f9dc2eacfaea47..c6a606e31acd11b1084090670145156c294427a6 100644 (file)
--- a/ext/ereg/tests/ereg_replace_variation_003.phpt
+++ b/ext/ereg/tests/ereg_replace_variation_003.phpt
@@ -85,84 +85,109 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(1) "0"
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(9) "new value"
 
 Arg value 12345 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(13) "new value2345"
 
 Arg value -2345 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(5) "-2345"
 
 Arg value 10.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(12) "new value0.5"
 
 Arg value -10.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(13) "-new value0.5"
 
 Arg value 101234567000 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(28) "new value0new value234567000"
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(29) "new value.0765432new valueE-9"
 
 Arg value 0.5 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(3) "0.5"
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(9) "new value"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value 1 
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(9) "new value"
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(0) ""
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 Error: 2 - ereg_replace() expects parameter 3 to be string, object given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function ereg_replace() is deprecated, %s(74)
 string(0) ""
 Done

diff --git a/ext/ereg/tests/ereg_variation_001.phpt b/ext/ereg/tests/ereg_variation_001.phpt
index 977404d054be6d63acc0e891149a1b252109b7a6..52b88abb71a81c23e8764e453a15b35fdd2357bd 100644 (file)
--- a/ext/ereg/tests/ereg_variation_001.phpt
+++ b/ext/ereg/tests/ereg_variation_001.phpt
@@ -86,93 +86,118 @@ Error: 8 - Undefined variable: undefined_var, %s(65)
 Error: 8 - Undefined variable: unset_var, %s(68)
 
 Arg value 0 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 int(1)
 
 Arg value 12345 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 bool(false)
 
 Arg value -2345 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 bool(false)
 
 Arg value 10.5 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 bool(false)
 
 Arg value -10.5 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 bool(false)
 
 Arg value 101234567000 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 bool(false)
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 bool(false)
 
 Arg value 0.5 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 2 - ereg(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 2 - ereg(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 int(1)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 2 - ereg(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function ereg() is deprecated, %s(75)
 int(1)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 2 - ereg(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 2 - ereg(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 2 - ereg(): REG_EMPTY, %s(75)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(74)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(75)
 Error: 8 - Object of class stdClass to string conversion, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 2 - ereg(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(75)
 Error: 2 - ereg(): REG_EMPTY, %s(75)
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_variation_002.phpt b/ext/ereg/tests/ereg_variation_002.phpt
index 6cd63c19cb4904b84cc1de17565cf98e94d8af09..1b3e3fc46c5caaae80bbef784ebc481f6fbe65e5 100644 (file)
--- a/ext/ereg/tests/ereg_variation_002.phpt
+++ b/ext/ereg/tests/ereg_variation_002.phpt
@@ -85,84 +85,109 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 int(1)
 
 Arg value 12345 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 int(1)
 
 Arg value -2345 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 
 Arg value 10.5 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 int(1)
 
 Arg value -10.5 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 int(1)
 
 Arg value 101234567000 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 int(1)
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 int(1)
 
 Arg value 0.5 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 Error: 2 - ereg() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 Error: 2 - ereg() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 Error: 2 - ereg() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 Error: 2 - ereg() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 Error: 2 - ereg() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 int(1)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function ereg() is deprecated, %s(74)
 int(1)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(74)
 Error: 2 - ereg() expects parameter 2 to be string, object given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(74)
 bool(false)
 Done

diff --git a/ext/ereg/tests/ereg_variation_003.phpt b/ext/ereg/tests/ereg_variation_003.phpt
index 42c1ae1bb1ce8f710367d5f75619a3c7ffc78644..bf898d908f2590d4bcfd5af0ede4836d3b132c7b 100644 (file)
--- a/ext/ereg/tests/ereg_variation_003.phpt
+++ b/ext/ereg/tests/ereg_variation_003.phpt
@@ -83,6 +83,7 @@ Error: 8 - Undefined variable: undefined_var, %s(61)
 Error: 8 - Undefined variable: unset_var, %s(64)
 
 Arg value 0 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -92,6 +93,7 @@ array(2) {
 }
 
 Arg value 1 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -101,6 +103,7 @@ array(2) {
 }
 
 Arg value 12345 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -110,6 +113,7 @@ array(2) {
 }
 
 Arg value -2345 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -119,6 +123,7 @@ array(2) {
 }
 
 Arg value 10.5 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -128,6 +133,7 @@ array(2) {
 }
 
 Arg value -10.5 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -137,6 +143,7 @@ array(2) {
 }
 
 Arg value 101234567000 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -146,6 +153,7 @@ array(2) {
 }
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -155,6 +163,7 @@ array(2) {
 }
 
 Arg value 0.5 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -164,6 +173,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -173,6 +183,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -182,6 +193,7 @@ array(2) {
 }
 
 Arg value 1 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -191,6 +203,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -200,6 +213,7 @@ array(2) {
 }
 
 Arg value 1 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -209,6 +223,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -218,6 +233,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -227,6 +243,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -236,6 +253,7 @@ array(2) {
 }
 
 Arg value string 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -245,6 +263,7 @@ array(2) {
 }
 
 Arg value string 
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -255,6 +274,7 @@ array(2) {
 Error: 4096 - Object of class stdClass could not be converted to string, %s(70)
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -264,6 +284,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -273,6 +294,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function ereg() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -280,4 +302,4 @@ array(2) {
   [1]=>
   string(2) "el"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/ereg_variation_004.phpt b/ext/ereg/tests/ereg_variation_004.phpt
index cbbb3c15e673aa0bc4838c222c1b6fd507694136..86f616f86fd963ea0b79762633ef868aa703e9ec 100644 (file)
--- a/ext/ereg/tests/ereg_variation_004.phpt
+++ b/ext/ereg/tests/ereg_variation_004.phpt
@@ -12,7 +12,8 @@ var_dump(ereg('l{2}', 'hello', str_repeat('x',1)));
 echo "Done";
 ?>
 --EXPECTF--
+Strict Standards: Only variables should be passed by reference in %s on line %d
 
-Strict Standards: Only variables should be passed by reference in %s on line 8
+Deprecated: Function ereg() is deprecated in %s on line %d
 int(2)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_basic.phpt b/ext/ereg/tests/eregi_basic.phpt
index de1db0ed46ad70199122502d0964ffafa17142f9..14b4b7d3952c8027b03cca36add55e64840a87b0 100644 (file)
--- a/ext/ereg/tests/eregi_basic.phpt
+++ b/ext/ereg/tests/eregi_basic.phpt
@@ -28,14 +28,18 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing eregi() : basic functionality ***
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(5)
 array(1) {
   [0]=>
   string(5) "WORDS"
 }
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(10)
 array(1) {
   [0]=>
   string(10) "MIxED CaSe"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_basic_001.phpt b/ext/ereg/tests/eregi_basic_001.phpt
index 8557b8111dd46b7b32c37a0d45d67ba6d5e56b8e..9460b89e115efd56b9f16b3aa57937e6d292fa38 100644 (file)
--- a/ext/ereg/tests/eregi_basic_001.phpt
+++ b/ext/ereg/tests/eregi_basic_001.phpt
@@ -28,6 +28,8 @@ echo "Done";
 --EXPECTF--
 *** Testing eregi() : basic functionality ***
 --> Pattern: '..(a|b|c)(a|b|c)..'; string: '--- ab ---'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(6)
 array(3) {
   [0]=>
@@ -38,6 +40,8 @@ array(3) {
   string(1) "b"
 }
 --> Pattern: '()'; string: ''
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 array(2) {
   [0]=>
@@ -46,6 +50,8 @@ array(2) {
   bool(false)
 }
 --> Pattern: '()'; string: 'abcdef'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 array(2) {
   [0]=>
@@ -54,12 +60,16 @@ array(2) {
   bool(false)
 }
 --> Pattern: '[x]|[^x]'; string: 'abcdef'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 array(1) {
   [0]=>
   string(1) "a"
 }
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; string: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(15)
 array(6) {
   [0]=>
@@ -76,36 +86,48 @@ array(6) {
   string(3) "ddd"
 }
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; string: '\`^.[$()|*+?{''
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(14)
 array(1) {
   [0]=>
   string(14) "\`^.[$()|*+?{'"
 }
 --> Pattern: '\a'; string: 'a'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 array(1) {
   [0]=>
   string(1) "a"
 }
 --> Pattern: '[0-9][^0-9]'; string: '2a'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(2)
 array(1) {
   [0]=>
   string(2) "2a"
 }
 --> Pattern: '^[[:alnum:]]{62,62}$'; string: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(62)
 array(1) {
   [0]=>
   string(62) "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 }
 --> Pattern: '^[[:digit:]]{5}'; string: '0123456789'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(5)
 array(1) {
   [0]=>
   string(5) "01234"
 }
 --> Pattern: '[[:digit:]]{5}$'; string: '0123456789'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(5)
 array(1) {
   [0]=>
@@ -113,15 +135,19 @@ array(1) {
 }
 --> Pattern: '[[:blank:]]{1,10}'; string: '
        '
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(2)
 array(1) {
   [0]=>
   string(2) "  "
 }
 --> Pattern: '[[:print:]]{3}'; string: ' a '
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(3)
 array(1) {
   [0]=>
   string(3) " a "
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_basic_002.phpt b/ext/ereg/tests/eregi_basic_002.phpt
index 8c5d0e471eb4f1ba08e0d787c96ae4c396ab1982..f81821ab1bcabbce038f6b69609e8e0f910dc083 100644 (file)
--- a/ext/ereg/tests/eregi_basic_002.phpt
+++ b/ext/ereg/tests/eregi_basic_002.phpt
@@ -27,30 +27,56 @@ echo "Done";
 --EXPECTF--
 *** Testing eregi() : basic functionality ***
 --> Pattern: '..(a|b|c)(a|b|c)..'; string: '--- ab ---'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '()'; string: ''
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '()'; string: 'abcdef'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[x]|[^x]'; string: 'abcdef'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; string: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; string: '\`^.[$()|*+?{''
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '\a'; string: 'a'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[0-9][^0-9]'; string: '2a'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '^[[:alnum:]]{62,62}$'; string: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '^[[:digit:]]{5}'; string: '0123456789'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[[:digit:]]{5}$'; string: '0123456789'
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[[:blank:]]{1,10}'; string: '
        '
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
 --> Pattern: '[[:print:]]{3}'; string: ' a '
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_basic_003.phpt b/ext/ereg/tests/eregi_basic_003.phpt
index a4861caa8377088a219e8ba595e1a4691d11ed7b..f045ad42805bc3706ab8e650a56ed4c8b979706c 100644 (file)
--- a/ext/ereg/tests/eregi_basic_003.phpt
+++ b/ext/ereg/tests/eregi_basic_003.phpt
@@ -19,7 +19,10 @@ var_dump(count($regs));
 echo "Done";
 ?>
 --EXPECTF--
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(1)
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(2048)
 int(2049)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_basic_004.phpt b/ext/ereg/tests/eregi_basic_004.phpt
index ad411e21f573827b768a75081be1f6a67fc3cf45..78d8f5e547f2e341d543918e44687bfd8d6fcbf6 100644 (file)
--- a/ext/ereg/tests/eregi_basic_004.phpt
+++ b/ext/ereg/tests/eregi_basic_004.phpt
@@ -22,10 +22,19 @@ var_dump($regs);
 echo "Done";
 ?>
 --EXPECTF--
+Deprecated: Function eregi() is deprecated in %s on line %d
 bool(false)
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 bool(false)
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 bool(false)
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 bool(false)
+
+Deprecated: Function eregi() is deprecated in %s on line %d
 bool(false)
 string(8) "original"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_error_001.phpt b/ext/ereg/tests/eregi_error_001.phpt
index 0809d8b67e4c83ac296ab1730f298e6ae67cffbf..fed3a725c2715b485ca5da9de60a1a06916b1216 100644 (file)
--- a/ext/ereg/tests/eregi_error_001.phpt
+++ b/ext/ereg/tests/eregi_error_001.phpt
@@ -35,11 +35,15 @@ echo "Done";
 
 -- Testing eregi() function with more than expected no. of arguments --
 
-Warning: eregi() expects at most 3 parameters, 4 given in %s on line 21
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing eregi() function with less than expected no. of arguments --
 
-Warning: eregi() expects at least 2 parameters, 1 given in %s on line 26
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 Done

diff --git a/ext/ereg/tests/eregi_error_002.phpt b/ext/ereg/tests/eregi_error_002.phpt
index 3c3bd7c992d742b295c926d691d70294ae90f5a2..2764741d5de5a8d77e9cd7f4573a0a726a78977f 100644 (file)
--- a/ext/ereg/tests/eregi_error_002.phpt
+++ b/ext/ereg/tests/eregi_error_002.phpt
@@ -40,49 +40,79 @@ echo "Done";
 --EXPECTF--
 *** Testing eregi() : error conditions ***
 
-Warning: eregi(): REG_EMPTY in %s on line 16
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_EPAREN in %s on line 17
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_EBRACK in %s on line 18
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_EBRACK in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_EPAREN in %s on line 19
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_BADRPT in %s on line 20
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_BADRPT in %s on line 21
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_BADRPT in %s on line 22
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_BADRPT in %s on line 23
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_BADBR in %s on line 24
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_EMPTY in %s on line 25
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_EMPTY in %s on line 26
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_BADBR in %s on line 27
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_ERANGE in %s on line 28
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_ERANGE in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_EESCAPE in %s on line 29
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_EESCAPE in %s on line %d
 bool(false)
 
-Warning: eregi(): REG_ERANGE in %s on line 30
+Deprecated: Function eregi() is deprecated in %s on line %d
+
+Warning: eregi(): REG_ERANGE in %s on line %d
 bool(false)
 string(8) "original"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_replace_basic.phpt b/ext/ereg/tests/eregi_replace_basic.phpt
index f9f025fe98070c341800e8888609771487f7a666..f965c8f03a4dfc8a29fd991c4464dacca8d64568 100644 (file)
--- a/ext/ereg/tests/eregi_replace_basic.phpt
+++ b/ext/ereg/tests/eregi_replace_basic.phpt
@@ -32,5 +32,7 @@ String Before...
 string(50) "UPPERCASE WORDS, lowercase words, MIxED CaSe woRdS"
 
 String after...
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(65) "UPPERCASE_characterS, lowercase_characters, MIxED CaSe_characterS"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_replace_basic_001.phpt b/ext/ereg/tests/eregi_replace_basic_001.phpt
index bffcd063776918f01459a516ff464f1324e4006c..710e39e2de3a3c4a11c1233c5d2389c72ab74115 100644 (file)
--- a/ext/ereg/tests/eregi_replace_basic_001.phpt
+++ b/ext/ereg/tests/eregi_replace_basic_001.phpt
@@ -29,32 +29,58 @@ echo "Done";
 --EXPECTF--
 *** Testing ereg() : basic functionality ***
 --> Pattern: '..(a|b|c)(a|b|c)..'; match: '--- ab ---'
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(82) "--[this is a replacement]-- this contains some matches --[this is a replacement]--"
 --> Pattern: '()'; match: ''
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(695) "[this is a replacement] [this is a replacement]t[this is a replacement]h[this is a replacement]i[this is a replacement]s[this is a replacement] [this is a replacement]c[this is a replacement]o[this is a replacement]n[this is a replacement]t[this is a replacement]a[this is a replacement]i[this is a replacement]n[this is a replacement]s[this is a replacement] [this is a replacement]s[this is a replacement]o[this is a replacement]m[this is a replacement]e[this is a replacement] [this is a replacement]m[this is a replacement]a[this is a replacement]t[this is a replacement]c[this is a replacement]h[this is a replacement]e[this is a replacement]s[this is a replacement] [this is a replacement]"
 --> Pattern: '()'; match: 'abcdef'
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(983) "[this is a replacement]a[this is a replacement]b[this is a replacement]c[this is a replacement]d[this is a replacement]e[this is a replacement]f[this is a replacement] [this is a replacement]t[this is a replacement]h[this is a replacement]i[this is a replacement]s[this is a replacement] [this is a replacement]c[this is a replacement]o[this is a replacement]n[this is a replacement]t[this is a replacement]a[this is a replacement]i[this is a replacement]n[this is a replacement]s[this is a replacement] [this is a replacement]s[this is a replacement]o[this is a replacement]m[this is a replacement]e[this is a replacement] [this is a replacement]m[this is a replacement]a[this is a replacement]t[this is a replacement]c[this is a replacement]h[this is a replacement]e[this is a replacement]s[this is a replacement] [this is a replacement]a[this is a replacement]b[this is a replacement]c[this is a replacement]d[this is a replacement]e[this is a replacement]f[this is a replacement]"
 --> Pattern: '[x]|[^x]'; match: 'abcdef'
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(920) "[this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement]"
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; match: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(90) "--- [this is a replacement] --- this contains some matches --- [this is a replacement] ---"
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; match: '\`^.[$()|*+?{''
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(74) "[this is a replacement] this contains some matches [this is a replacement]"
 --> Pattern: '\a'; match: 'a'
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(118) "[this is a replacement] this cont[this is a replacement]ins some m[this is a replacement]tches [this is a replacement]"
 --> Pattern: '[0-9][^0-9]'; match: '2a'
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(74) "[this is a replacement] this contains some matches [this is a replacement]"
 --> Pattern: '^[[:alnum:]]{62,62}$'; match: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(152) "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ this contains some matches 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 --> Pattern: '^[[:digit:]]{5}'; match: '0123456789'
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(66) "[this is a replacement]56789 this contains some matches 0123456789"
 --> Pattern: '[[:digit:]]{5}$'; match: '0123456789'
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(66) "0123456789 this contains some matches 01234[this is a replacement]"
 --> Pattern: '[[:blank:]]{1,10}'; match: '
        '
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(163) "
 [this is a replacement]this[this is a replacement]contains[this is a replacement]some[this is a replacement]matches[this is a replacement]
 [this is a replacement]"
 --> Pattern: '[[:print:]]{3}'; match: ' a '
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(254) "[this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement][this is a replacement] "
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_replace_basic_002.phpt b/ext/ereg/tests/eregi_replace_basic_002.phpt
index 7a4bd3d841aa9bc7c45d5b00722a35ab9b92a7b2..7683e3323ea11ba0dbfc9527c52da9d2fc956803 100644 (file)
--- a/ext/ereg/tests/eregi_replace_basic_002.phpt
+++ b/ext/ereg/tests/eregi_replace_basic_002.phpt
@@ -20,9 +20,18 @@ var_dump(eregi_replace('[:alpha:]', $replacement, 'x'));
 echo "Done";
 ?>
 --EXPECTF--
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(1) "0"
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(3) "aaa"
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(2) "ba"
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(2) "ba"
+
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
 string(1) "x"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_replace_error_001.phpt b/ext/ereg/tests/eregi_replace_error_001.phpt
index d4983abe4a918cda2922f5b2aa3163d0c8cd0e60..ff94833555e2e95d40d4bd23c7cd49655ad6223e 100644 (file)
--- a/ext/ereg/tests/eregi_replace_error_001.phpt
+++ b/ext/ereg/tests/eregi_replace_error_001.phpt
@@ -32,11 +32,15 @@ echo "Done";
 
 -- Testing eregi_replace() function with more than expected no. of arguments --
 
-Warning: eregi_replace() expects exactly 3 parameters, 4 given in %s on line 17
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace() expects exactly 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing eregi_replace() function with less than expected no. of arguments --
 
-Warning: eregi_replace() expects exactly 3 parameters, 2 given in %s on line 23
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace() expects exactly 3 parameters, 2 given in %s on line %d
 NULL
 Done

diff --git a/ext/ereg/tests/eregi_replace_error_002.phpt b/ext/ereg/tests/eregi_replace_error_002.phpt
index 35684b8bde601dae12307adc23dff8859610c0cd..32c58613d2a944eeb8e96c997650fa4c113cbd28 100644 (file)
--- a/ext/ereg/tests/eregi_replace_error_002.phpt
+++ b/ext/ereg/tests/eregi_replace_error_002.phpt
@@ -29,48 +29,78 @@ echo "Done";
 --EXPECTF--
 *** Testing eregi_replace() : bad REs ***
 
-Warning: eregi_replace(): REG_EMPTY in %s on line 9
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_EPAREN in %s on line 10
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_EBRACK in %s on line 11
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_EBRACK in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_EPAREN in %s on line 12
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_BADRPT in %s on line 13
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_BADRPT in %s on line 14
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_BADRPT in %s on line 15
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_BADRPT in %s on line 16
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_BADBR in %s on line 17
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_EMPTY in %s on line 18
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_EMPTY in %s on line 19
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_BADBR in %s on line 20
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_ERANGE in %s on line 21
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_ERANGE in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_EESCAPE in %s on line 22
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_EESCAPE in %s on line %d
 bool(false)
 
-Warning: eregi_replace(): REG_ERANGE in %s on line 23
+Deprecated: Function eregi_replace() is deprecated in %s on line %d
+
+Warning: eregi_replace(): REG_ERANGE in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_replace_variation_001.phpt b/ext/ereg/tests/eregi_replace_variation_001.phpt
index 87f9aa277c4c19b8522b783b6ec0a8f37cdb5c30..af2935db6e3ed4d370b2fa6ed294b3a67483cec2 100644 (file)
--- a/ext/ereg/tests/eregi_replace_variation_001.phpt
+++ b/ext/ereg/tests/eregi_replace_variation_001.phpt
@@ -85,91 +85,116 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value 12345 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value -2345 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value 10.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value -10.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value 101234567000 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 0.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "original"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 8 - Object of class stdClass could not be converted to int, %s(74)
 string(8) "original"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace(): REG_EMPTY, %s(74)
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_replace_variation_002.phpt b/ext/ereg/tests/eregi_replace_variation_002.phpt
index 4186d0fd3d26e1dbfc240b944ceb22cf99cc880b..5755b74f4120cdb9277a7c4db5d26e3ec2fb7db3 100644 (file)
--- a/ext/ereg/tests/eregi_replace_variation_002.phpt
+++ b/ext/ereg/tests/eregi_replace_variation_002.phpt
@@ -85,79 +85,104 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value 12345 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(6) "h9o%21"
 
 Arg value -2345 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%D7o%21"
 
 Arg value 10.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%0Ao%21"
 
 Arg value -10.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%F6o%21"
 
 Arg value 101234567000 
-string(%d) "h%so%21"
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
+string(8) "h%FFo%21"
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value 0.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(8) "h%01o%21"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 8 - Object of class stdClass could not be converted to int, %s(74)
 string(8) "h%01o%21"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "ho%21"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_replace_variation_003.phpt b/ext/ereg/tests/eregi_replace_variation_003.phpt
index 61d468454bc1722c847138c8871507d12f372e81..8e8e5086bdc4cf6b6843ace33f40abab2e6fba11 100644 (file)
--- a/ext/ereg/tests/eregi_replace_variation_003.phpt
+++ b/ext/ereg/tests/eregi_replace_variation_003.phpt
@@ -85,84 +85,109 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(1) "0"
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(9) "new value"
 
 Arg value 12345 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(13) "new value2345"
 
 Arg value -2345 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(5) "-2345"
 
 Arg value 10.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(12) "new value0.5"
 
 Arg value -10.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(13) "-new value0.5"
 
 Arg value 101234567000 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(28) "new value0new value234567000"
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(29) "new value.0765432new valueE-9"
 
 Arg value 0.5 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(3) "0.5"
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace() expects parameter 3 to be string, array given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(9) "new value"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value 1 
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(9) "new value"
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(0) ""
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 Error: 2 - eregi_replace() expects parameter 3 to be string, object given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function eregi_replace() is deprecated, %s(74)
 string(0) ""
 Done

diff --git a/ext/ereg/tests/eregi_variation_001.phpt b/ext/ereg/tests/eregi_variation_001.phpt
index ea8b8440dcbacd149b83a0b73d7a4560ce782407..54e80bb16ed2336c40d616557d72836df8ed251b 100644 (file)
--- a/ext/ereg/tests/eregi_variation_001.phpt
+++ b/ext/ereg/tests/eregi_variation_001.phpt
@@ -86,93 +86,118 @@ Error: 8 - Undefined variable: undefined_var, %s(65)
 Error: 8 - Undefined variable: unset_var, %s(68)
 
 Arg value 0 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 int(1)
 
 Arg value 12345 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 bool(false)
 
 Arg value -2345 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 bool(false)
 
 Arg value 10.5 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 bool(false)
 
 Arg value -10.5 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 bool(false)
 
 Arg value 101234567000 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 bool(false)
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 bool(false)
 
 Arg value 0.5 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 8 - Array to string conversion, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 2 - eregi(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 2 - eregi(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 int(1)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 2 - eregi(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function eregi() is deprecated, %s(75)
 int(1)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 2 - eregi(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 2 - eregi(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 2 - eregi(): REG_EMPTY, %s(75)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(74)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(75)
 Error: 8 - Object of class stdClass to string conversion, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 2 - eregi(): REG_EMPTY, %s(75)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(75)
 Error: 2 - eregi(): REG_EMPTY, %s(75)
 bool(false)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_variation_002.phpt b/ext/ereg/tests/eregi_variation_002.phpt
index 7ca31cf21a47cead567818b30fcf302a6a78be06..bb7fc3563677cd66342b1ddc598a3c35ec3b1697 100644 (file)
--- a/ext/ereg/tests/eregi_variation_002.phpt
+++ b/ext/ereg/tests/eregi_variation_002.phpt
@@ -85,84 +85,109 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 int(1)
 
 Arg value 12345 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 int(1)
 
 Arg value -2345 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 
 Arg value 10.5 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 int(1)
 
 Arg value -10.5 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 int(1)
 
 Arg value 101234567000 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 int(1)
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 int(1)
 
 Arg value 0.5 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 Error: 2 - eregi() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 Error: 2 - eregi() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 Error: 2 - eregi() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 Error: 2 - eregi() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 Error: 2 - eregi() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 int(1)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function eregi() is deprecated, %s(74)
 int(1)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(74)
 Error: 2 - eregi() expects parameter 2 to be string, object given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(74)
 bool(false)
 Done

diff --git a/ext/ereg/tests/eregi_variation_003.phpt b/ext/ereg/tests/eregi_variation_003.phpt
index 43785871a9949fcc4caa00332a1c506750cf654a..97777e22fff0afac4c60011b6d1ce73e0159a496 100644 (file)
--- a/ext/ereg/tests/eregi_variation_003.phpt
+++ b/ext/ereg/tests/eregi_variation_003.phpt
@@ -83,6 +83,7 @@ Error: 8 - Undefined variable: undefined_var, %s(61)
 Error: 8 - Undefined variable: unset_var, %s(64)
 
 Arg value 0 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -92,6 +93,7 @@ array(2) {
 }
 
 Arg value 1 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -101,6 +103,7 @@ array(2) {
 }
 
 Arg value 12345 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -110,6 +113,7 @@ array(2) {
 }
 
 Arg value -2345 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -119,6 +123,7 @@ array(2) {
 }
 
 Arg value 10.5 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -128,6 +133,7 @@ array(2) {
 }
 
 Arg value -10.5 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -137,6 +143,7 @@ array(2) {
 }
 
 Arg value 101234567000 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -146,6 +153,7 @@ array(2) {
 }
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -155,6 +163,7 @@ array(2) {
 }
 
 Arg value 0.5 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -164,6 +173,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -173,6 +183,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -182,6 +193,7 @@ array(2) {
 }
 
 Arg value 1 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -191,6 +203,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -200,6 +213,7 @@ array(2) {
 }
 
 Arg value 1 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -209,6 +223,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -218,6 +233,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -227,6 +243,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -236,6 +253,7 @@ array(2) {
 }
 
 Arg value string 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -245,6 +263,7 @@ array(2) {
 }
 
 Arg value string 
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -255,6 +274,7 @@ array(2) {
 Error: 4096 - Object of class stdClass could not be converted to string, %s(70)
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -264,6 +284,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -273,6 +294,7 @@ array(2) {
 }
 
 Arg value  
+Error: 8192 - Function eregi() is deprecated, %s(71)
 int(6)
 array(2) {
   [0]=>
@@ -280,4 +302,4 @@ array(2) {
   [1]=>
   string(2) "el"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/eregi_variation_004.phpt b/ext/ereg/tests/eregi_variation_004.phpt
index bf4f03695080124273c9bc16dbae54da369e7f30..7378c36d3d8530c34ec76dc95a268275a06185f0 100644 (file)
--- a/ext/ereg/tests/eregi_variation_004.phpt
+++ b/ext/ereg/tests/eregi_variation_004.phpt
@@ -12,7 +12,8 @@ var_dump(eregi('l{2}', 'hello', str_repeat('x',1)));
 echo "Done";
 ?>
 --EXPECTF--
+Strict Standards: Only variables should be passed by reference in %s on line %d
 
-Strict Standards: Only variables should be passed by reference in %s on line 8
+Deprecated: Function eregi() is deprecated in %s on line %d
 int(2)
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/split_basic_001.phpt b/ext/ereg/tests/split_basic_001.phpt
index e122e2c15bc208e686782855ea85ea4fc0f0c33f..1c11f71ca85da0677a3897864d9af8ca56d3f55c 100644 (file)
--- a/ext/ereg/tests/split_basic_001.phpt
+++ b/ext/ereg/tests/split_basic_001.phpt
@@ -28,6 +28,8 @@ echo "Done";
 *** Testing ereg() : basic functionality ***
 
 --> Pattern: '..(a|b|c)(a|b|c)..'; match: '--- ab ---'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(2) "--"
@@ -37,15 +39,21 @@ array(2) {
 
 --> Pattern: '()'; match: ''
 
-Warning: split(): Invalid Regular Expression in %s on line 19
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): Invalid Regular Expression in %s on line %d
 bool(false)
 
 --> Pattern: '()'; match: 'abcdef'
 
-Warning: split(): Invalid Regular Expression in %s on line 19
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): Invalid Regular Expression in %s on line %d
 bool(false)
 
 --> Pattern: '[x]|[^x]'; match: 'abcdef'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -54,6 +62,8 @@ array(2) {
 }
 
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; match: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(4) "--- "
@@ -62,6 +72,8 @@ array(2) {
 }
 
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; match: '\`^.[$()|*+?{''
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -70,6 +82,8 @@ array(2) {
 }
 
 --> Pattern: '\a'; match: 'a'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -78,6 +92,8 @@ array(2) {
 }
 
 --> Pattern: '[0-9][^0-9]'; match: '2a'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -86,12 +102,16 @@ array(2) {
 }
 
 --> Pattern: '^[[:alnum:]]{62,62}$'; match: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(196) "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ |1| 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ |2| 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 }
 
 --> Pattern: '^[[:digit:]]{5}'; match: '0123456789'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -100,6 +120,8 @@ array(2) {
 }
 
 --> Pattern: '[[:digit:]]{5}$'; match: '0123456789'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(35) "0123456789 |1| 0123456789 |2| 01234"
@@ -109,6 +131,8 @@ array(2) {
 
 --> Pattern: '[[:blank:]]{1,10}'; match: '
        '
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(1) "
@@ -120,6 +144,8 @@ array(2) {
 }
 
 --> Pattern: '[[:print:]]{3}'; match: ' a '
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""

diff --git a/ext/ereg/tests/split_basic_002.phpt b/ext/ereg/tests/split_basic_002.phpt
index 110007d3e5635d5529b9f3a9951fc1f9954c2fa4..443a6b6b92f4533df14ab690d947a142436cf4ff 100644 (file)
--- a/ext/ereg/tests/split_basic_002.phpt
+++ b/ext/ereg/tests/split_basic_002.phpt
@@ -28,6 +28,8 @@ echo "Done";
 *** Testing ereg() : basic functionality ***
 
 --> Pattern: '..(a|b|c)(a|b|c)..'; match: '--- ab ---'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(4) {
   [0]=>
   string(2) "--"
@@ -41,15 +43,21 @@ array(4) {
 
 --> Pattern: '()'; match: ''
 
-Warning: split(): Invalid Regular Expression in %s on line 19
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): Invalid Regular Expression in %s on line %d
 bool(false)
 
 --> Pattern: '()'; match: 'abcdef'
 
-Warning: split(): Invalid Regular Expression in %s on line 19
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): Invalid Regular Expression in %s on line %d
 bool(false)
 
 --> Pattern: '[x]|[^x]'; match: 'abcdef'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(29) {
   [0]=>
   string(0) ""
@@ -112,6 +120,8 @@ array(29) {
 }
 
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; match: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(4) {
   [0]=>
   string(4) "--- "
@@ -124,6 +134,8 @@ array(4) {
 }
 
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; match: '\`^.[$()|*+?{''
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(4) {
   [0]=>
   string(0) ""
@@ -136,6 +148,8 @@ array(4) {
 }
 
 --> Pattern: '\a'; match: 'a'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(4) {
   [0]=>
   string(0) ""
@@ -148,6 +162,8 @@ array(4) {
 }
 
 --> Pattern: '[0-9][^0-9]'; match: '2a'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(6) {
   [0]=>
   string(0) ""
@@ -164,12 +180,16 @@ array(6) {
 }
 
 --> Pattern: '^[[:alnum:]]{62,62}$'; match: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(196) "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ |1| 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ |2| 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 }
 
 --> Pattern: '^[[:digit:]]{5}'; match: '0123456789'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(3) {
   [0]=>
   string(0) ""
@@ -180,6 +200,8 @@ array(3) {
 }
 
 --> Pattern: '[[:digit:]]{5}$'; match: '0123456789'
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(35) "0123456789 |1| 0123456789 |2| 01234"
@@ -189,6 +211,8 @@ array(2) {
 
 --> Pattern: '[[:blank:]]{1,10}'; match: '
        '
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(6) {
   [0]=>
   string(1) "
@@ -208,6 +232,8 @@ array(6) {
 }
 
 --> Pattern: '[[:print:]]{3}'; match: ' a '
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(7) {
   [0]=>
   string(0) ""

diff --git a/ext/ereg/tests/split_basic_003.phpt b/ext/ereg/tests/split_basic_003.phpt
index 4d36fcddb38195180c0846e3e28f67155989f89c..8767144f7db1f6125e3e4ae802eb21e87c45ac81 100644 (file)
--- a/ext/ereg/tests/split_basic_003.phpt
+++ b/ext/ereg/tests/split_basic_003.phpt
@@ -21,28 +21,39 @@ var_dump(split('[:alpha:]', '--- x ---'));
 echo "Done";
 ?>
 --EXPECTF--
+Deprecated: Function split() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(7) "-- a --"
 }
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(7) "-- 0 --"
 }
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(11) "--- aaa ---"
 }
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(10) "--- ba ---"
 }
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(10) "--- ba ---"
 }
+
+Deprecated: Function split() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(9) "--- x ---"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/split_error_001.phpt b/ext/ereg/tests/split_error_001.phpt
index cc226df6cb736460121843b3b21b1d44d85daa9d..2575717a2290f3bce069e6348f6787ea1def805e 100644 (file)
--- a/ext/ereg/tests/split_error_001.phpt
+++ b/ext/ereg/tests/split_error_001.phpt
@@ -31,11 +31,15 @@ echo "Done";
 
 -- Testing split() function with more than expected no. of arguments --
 
-Warning: split() expects at most 3 parameters, 4 given in %s on line 17
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing split() function with less than expected no. of arguments --
 
-Warning: split() expects at least 2 parameters, 1 given in %s on line 22
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 Done

diff --git a/ext/ereg/tests/split_error_002.phpt b/ext/ereg/tests/split_error_002.phpt
index c0a4529cd7b35967cc8bcbeae36c2edb6ec6f37c..9eaac59e44fc4af832a0dc449c9e2d81ae6a637c 100644 (file)
--- a/ext/ereg/tests/split_error_002.phpt
+++ b/ext/ereg/tests/split_error_002.phpt
@@ -40,49 +40,79 @@ echo "Done";
 --EXPECTF--
 *** Testing split() : error conditions ***
 
-Warning: split(): REG_EMPTY in %s on line 16
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: split(): REG_EPAREN in %s on line 17
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: split(): REG_EBRACK in %s on line 18
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_EBRACK in %s on line %d
 bool(false)
 
-Warning: split(): REG_EPAREN in %s on line 19
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: split(): REG_BADRPT in %s on line 20
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: split(): REG_BADRPT in %s on line 21
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: split(): REG_BADRPT in %s on line 22
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: split() expects parameter 3 to be long, string given in %s on line 23
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split() expects parameter 3 to be long, string given in %s on line %d
 NULL
 
-Warning: split(): REG_BADBR in %s on line 24
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: split(): REG_EMPTY in %s on line 25
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: split(): REG_EMPTY in %s on line 26
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: split(): REG_BADBR in %s on line 27
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: split(): REG_ERANGE in %s on line 28
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_ERANGE in %s on line %d
 bool(false)
 
-Warning: split(): REG_EESCAPE in %s on line 29
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split(): REG_EESCAPE in %s on line %d
 bool(false)
 
-Warning: split() expects parameter 3 to be long, string given in %s on line 30
+Deprecated: Function split() is deprecated in %s on line %d
+
+Warning: split() expects parameter 3 to be long, string given in %s on line %d
 NULL
 string(8) "original"
 Done

diff --git a/ext/ereg/tests/split_variation_001.phpt b/ext/ereg/tests/split_variation_001.phpt
index 542f740b1d91622ffec5a4cfd44df770d9c12692..454c4b4250ce300c8c2d10225845a96bbb4baa5a 100644 (file)
--- a/ext/ereg/tests/split_variation_001.phpt
+++ b/ext/ereg/tests/split_variation_001.phpt
@@ -85,12 +85,14 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 1 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(4) {
   [0]=>
   string(0) ""
@@ -103,76 +105,91 @@ array(4) {
 }
 
 Arg value 12345 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value -2345 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 10.5 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value -10.5 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 101234567000 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 0.5 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(4) {
   [0]=>
   string(0) ""
@@ -185,10 +202,12 @@ array(4) {
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(4) {
   [0]=>
   string(0) ""
@@ -201,27 +220,33 @@ array(4) {
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split(): REG_EMPTY, %s(74)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 1 to be string, object given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split(): REG_EMPTY, %s(74)
 bool(false)
 Done

diff --git a/ext/ereg/tests/split_variation_002.phpt b/ext/ereg/tests/split_variation_002.phpt
index 7ccf2973fc2ab815c138b9c6ce7d69756782f673..2a07353136f57a4e001558549b2649a295998655 100644 (file)
--- a/ext/ereg/tests/split_variation_002.phpt
+++ b/ext/ereg/tests/split_variation_002.phpt
@@ -85,48 +85,56 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(1) "0"
 }
 
 Arg value 1 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(1) "1"
 }
 
 Arg value 12345 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(5) "12345"
 }
 
 Arg value -2345 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(5) "-2345"
 }
 
 Arg value 10.5 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(4) "10.5"
 }
 
 Arg value -10.5 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(5) "-10.5"
 }
 
 Arg value 101234567000 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(12) "101234567000"
 }
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(2) {
   [0]=>
   string(10) "1.07654321"
@@ -135,74 +143,88 @@ array(2) {
 }
 
 Arg value 0.5 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(3) "0.5"
 }
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value 1 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(1) "1"
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value 1 
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(1) "1"
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
@@ -210,16 +232,19 @@ array(1) {
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 Error: 2 - split() expects parameter 2 to be string, object given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""

diff --git a/ext/ereg/tests/split_variation_003.phpt b/ext/ereg/tests/split_variation_003.phpt
index 630d8ab2a2d6b43e01126c09234c273141713e3e..90b86c28ef5c25886d4cfef1f293f5218e50311d 100644 (file)
--- a/ext/ereg/tests/split_variation_003.phpt
+++ b/ext/ereg/tests/split_variation_003.phpt
@@ -82,6 +82,7 @@ echo "Done";
 *** Testing split() : usage variations ***
 
 Arg value 10.5 
+Error: 8192 - Function split() is deprecated, %s(73)
 array(5) {
   [0]=>
   string(1) "1"
@@ -96,107 +97,128 @@ array(5) {
 }
 
 Arg value -10.5 
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value 0.5 
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value Array 
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value 1 
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value 1 
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
 NULL
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
 NULL
 
 Arg value string 
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
 NULL
 
 Arg value string 
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, string given, %s(73)
 NULL
 Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(73)
 Error: 2 - split() expects parameter 3 to be long, object given, %s(73)
 NULL
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function split() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"

diff --git a/ext/ereg/tests/split_variation_004.phpt b/ext/ereg/tests/split_variation_004.phpt
index fbd76277ae91d13f7cf8c255bb918f10f34cd3f4..6b9a8697847dd7f84486fa40028ff636d790655c 100644 (file)
--- a/ext/ereg/tests/split_variation_004.phpt
+++ b/ext/ereg/tests/split_variation_004.phpt
@@ -25,14 +25,17 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing split() : usage variations ***
+Error: 8192 - Function split() is deprecated, %s(16)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
+Error: 8192 - Function split() is deprecated, %s(17)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
+Error: 8192 - Function split() is deprecated, %s(18)
 array(5) {
   [0]=>
   string(1) "1"
@@ -45,4 +48,4 @@ array(5) {
   [4]=>
   string(1) "5"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/spliti_basic_001.phpt b/ext/ereg/tests/spliti_basic_001.phpt
index 04f138d4e999155f8f04d2c3ab62bdb59807de13..743bd662129df70caa4922bf774a95d3a8507e4d 100644 (file)
--- a/ext/ereg/tests/spliti_basic_001.phpt
+++ b/ext/ereg/tests/spliti_basic_001.phpt
@@ -28,6 +28,8 @@ echo "Done";
 *** Testing ereg() : basic functionality ***
 
 --> Pattern: '..(a|b|c)(a|b|c)..'; match: '--- ab ---'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(2) "--"
@@ -37,15 +39,21 @@ array(2) {
 
 --> Pattern: '()'; match: ''
 
-Warning: spliti(): Invalid Regular Expression in %s on line 19
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): Invalid Regular Expression in %s on line %d
 bool(false)
 
 --> Pattern: '()'; match: 'abcdef'
 
-Warning: spliti(): Invalid Regular Expression in %s on line 19
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): Invalid Regular Expression in %s on line %d
 bool(false)
 
 --> Pattern: '[x]|[^x]'; match: 'abcdef'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -54,6 +62,8 @@ array(2) {
 }
 
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; match: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(4) "--- "
@@ -62,6 +72,8 @@ array(2) {
 }
 
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; match: '\`^.[$()|*+?{''
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -70,6 +82,8 @@ array(2) {
 }
 
 --> Pattern: '\a'; match: 'a'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -78,6 +92,8 @@ array(2) {
 }
 
 --> Pattern: '[0-9][^0-9]'; match: '2a'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -86,12 +102,16 @@ array(2) {
 }
 
 --> Pattern: '^[[:alnum:]]{62,62}$'; match: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(196) "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ |1| 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ |2| 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 }
 
 --> Pattern: '^[[:digit:]]{5}'; match: '0123456789'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""
@@ -100,6 +120,8 @@ array(2) {
 }
 
 --> Pattern: '[[:digit:]]{5}$'; match: '0123456789'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(35) "0123456789 |1| 0123456789 |2| 01234"
@@ -109,6 +131,8 @@ array(2) {
 
 --> Pattern: '[[:blank:]]{1,10}'; match: '
        '
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(1) "
@@ -120,6 +144,8 @@ array(2) {
 }
 
 --> Pattern: '[[:print:]]{3}'; match: ' a '
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(0) ""

diff --git a/ext/ereg/tests/spliti_basic_002.phpt b/ext/ereg/tests/spliti_basic_002.phpt
index 79784d324d316abe1a8eb7d12eb0f4ead6fbcb0f..df61a42cae315dc8aa69c4ee039c21367779fc54 100644 (file)
--- a/ext/ereg/tests/spliti_basic_002.phpt
+++ b/ext/ereg/tests/spliti_basic_002.phpt
@@ -28,6 +28,8 @@ echo "Done";
 *** Testing ereg() : basic functionality ***
 
 --> Pattern: '..(a|b|c)(a|b|c)..'; match: '--- ab ---'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(4) {
   [0]=>
   string(2) "--"
@@ -41,15 +43,21 @@ array(4) {
 
 --> Pattern: '()'; match: ''
 
-Warning: spliti(): Invalid Regular Expression in %s on line 19
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): Invalid Regular Expression in %s on line %d
 bool(false)
 
 --> Pattern: '()'; match: 'abcdef'
 
-Warning: spliti(): Invalid Regular Expression in %s on line 19
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): Invalid Regular Expression in %s on line %d
 bool(false)
 
 --> Pattern: '[x]|[^x]'; match: 'abcdef'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(29) {
   [0]=>
   string(0) ""
@@ -112,6 +120,8 @@ array(29) {
 }
 
 --> Pattern: '(a{1})(a{1,}) (b{1,3}) (c+) (d?ddd|e)'; match: '--- aaa bbb ccc ddd ---'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(4) {
   [0]=>
   string(4) "--- "
@@ -124,6 +134,8 @@ array(4) {
 }
 
 --> Pattern: '\\\`\^\.\[\$\(\)\|\*\+\?\{\''; match: '\`^.[$()|*+?{''
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(4) {
   [0]=>
   string(0) ""
@@ -136,6 +148,8 @@ array(4) {
 }
 
 --> Pattern: '\a'; match: 'a'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(4) {
   [0]=>
   string(0) ""
@@ -148,6 +162,8 @@ array(4) {
 }
 
 --> Pattern: '[0-9][^0-9]'; match: '2a'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(6) {
   [0]=>
   string(0) ""
@@ -164,12 +180,16 @@ array(6) {
 }
 
 --> Pattern: '^[[:alnum:]]{62,62}$'; match: '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(196) "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ |1| 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ |2| 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
 }
 
 --> Pattern: '^[[:digit:]]{5}'; match: '0123456789'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(3) {
   [0]=>
   string(0) ""
@@ -180,6 +200,8 @@ array(3) {
 }
 
 --> Pattern: '[[:digit:]]{5}$'; match: '0123456789'
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(35) "0123456789 |1| 0123456789 |2| 01234"
@@ -189,6 +211,8 @@ array(2) {
 
 --> Pattern: '[[:blank:]]{1,10}'; match: '
        '
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(6) {
   [0]=>
   string(1) "
@@ -208,6 +232,8 @@ array(6) {
 }
 
 --> Pattern: '[[:print:]]{3}'; match: ' a '
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(7) {
   [0]=>
   string(0) ""

diff --git a/ext/ereg/tests/spliti_basic_003.phpt b/ext/ereg/tests/spliti_basic_003.phpt
index 143f1a1961d60edd2e6ec19d1e3cbaba28aeb8b8..39bd1dcbf7bcea43b6b652433579776b7fd2d386 100644 (file)
--- a/ext/ereg/tests/spliti_basic_003.phpt
+++ b/ext/ereg/tests/spliti_basic_003.phpt
@@ -20,24 +20,33 @@ var_dump(spliti('[:alpha:]', '--- x ---'));
 echo "Done";
 ?>
 --EXPECTF--
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(7) "-- 0 --"
 }
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(11) "--- aaa ---"
 }
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(10) "--- ba ---"
 }
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(10) "--- ba ---"
 }
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(1) {
   [0]=>
   string(9) "--- x ---"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/spliti_basic_004.phpt b/ext/ereg/tests/spliti_basic_004.phpt
index 95edc158d96dc4ae4e31646cf6141925c35de3be..ed07193194a7bc715c16c7c2c6bc4e628b70b715 100644 (file)
--- a/ext/ereg/tests/spliti_basic_004.phpt
+++ b/ext/ereg/tests/spliti_basic_004.phpt
@@ -18,28 +18,35 @@ var_dump(spliti('[[:upper:]]', '--- a ---'));
 echo "Done";
 ?>
 --EXPECTF--
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(4) "--- "
   [1]=>
   string(4) " ---"
 }
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(4) "--- "
   [1]=>
   string(4) " ---"
 }
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(4) "--- "
   [1]=>
   string(4) " ---"
 }
+
+Deprecated: Function spliti() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(4) "--- "
   [1]=>
   string(4) " ---"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/spliti_error_001.phpt b/ext/ereg/tests/spliti_error_001.phpt
index 104364eec5d58d307d57b7edadfdcb1a6255c35c..cd4e6a99e6cf20acb7d3a5e9dd4e542fdfe19b12 100644 (file)
--- a/ext/ereg/tests/spliti_error_001.phpt
+++ b/ext/ereg/tests/spliti_error_001.phpt
@@ -31,11 +31,15 @@ echo "Done";
 
 -- Testing spliti() function with more than expected no. of arguments --
 
+Deprecated: Function spliti() is deprecated in %s on line %d
+
 Warning: spliti() expects at most 3 parameters, 4 given in %s on line %d
 NULL
 
 -- Testing spliti() function with less than expected no. of arguments --
 
+Deprecated: Function spliti() is deprecated in %s on line %d
+
 Warning: spliti() expects at least 2 parameters, 1 given in %s on line %d
 NULL
 Done

diff --git a/ext/ereg/tests/spliti_error_002.phpt b/ext/ereg/tests/spliti_error_002.phpt
index 7a7045dc1efd6925cd2df420cc9bd9541499664b..19dd171655c80bae498c3ca81e6f502f946dd734 100644 (file)
--- a/ext/ereg/tests/spliti_error_002.phpt
+++ b/ext/ereg/tests/spliti_error_002.phpt
@@ -40,48 +40,78 @@ echo "Done";
 --EXPECTF--
 *** Testing spliti() : error conditions ***
 
-Warning: spliti(): REG_EMPTY in %s on line 16
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EPAREN in %s on line 17
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EBRACK in %s on line 18
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_EBRACK in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EPAREN in %s on line 19
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_EPAREN in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_BADRPT in %s on line 20
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_BADRPT in %s on line 21
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_BADRPT in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_BADRPT in %s on line 22
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_BADRPT in %s on line %d
 bool(false)
 
+Deprecated: Function spliti() is deprecated in %s on line %d
+
 Warning: spliti() expects parameter 3 to be long, string given in %s on line %d
 NULL
 
-Warning: spliti(): REG_BADBR in %s on line 24
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EMPTY in %s on line 25
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EMPTY in %s on line 26
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_EMPTY in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_BADBR in %s on line 27
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_BADBR in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_ERANGE in %s on line 28
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_ERANGE in %s on line %d
 bool(false)
 
-Warning: spliti(): REG_EESCAPE in %s on line 29
+Deprecated: Function spliti() is deprecated in %s on line %d
+
+Warning: spliti(): REG_EESCAPE in %s on line %d
 bool(false)
 
+Deprecated: Function spliti() is deprecated in %s on line %d
+
 Warning: spliti() expects parameter 3 to be long, string given in %s on line %d
 NULL
 string(8) "original"

diff --git a/ext/ereg/tests/spliti_variation_001.phpt b/ext/ereg/tests/spliti_variation_001.phpt
index 4facee826ff38cc608547d78895923661293cf50..08c6ba0d99fb56c9626617ca60ad5b14f6fb1b2b 100644 (file)
--- a/ext/ereg/tests/spliti_variation_001.phpt
+++ b/ext/ereg/tests/spliti_variation_001.phpt
@@ -85,12 +85,14 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 1 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(4) {
   [0]=>
   string(0) ""
@@ -103,76 +105,91 @@ array(4) {
 }
 
 Arg value 12345 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value -2345 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 10.5 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value -10.5 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 101234567000 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value 0.5 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(16) "1 a 1 Array 1 c "
 }
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 1 to be string, array given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(4) {
   [0]=>
   string(0) ""
@@ -185,10 +202,12 @@ array(4) {
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value 1 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(4) {
   [0]=>
   string(0) ""
@@ -201,27 +220,33 @@ array(4) {
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti(): REG_EMPTY, %s(74)
 bool(false)
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 1 to be string, object given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti(): REG_EMPTY, %s(74)
 bool(false)
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti(): REG_EMPTY, %s(74)
 bool(false)
 Done

diff --git a/ext/ereg/tests/spliti_variation_002.phpt b/ext/ereg/tests/spliti_variation_002.phpt
index b59ef6d81e33ee67f40e7a12bdb200b850f683a1..03fc131e94a00479dcac3633fdc1f7964b064887 100644 (file)
--- a/ext/ereg/tests/spliti_variation_002.phpt
+++ b/ext/ereg/tests/spliti_variation_002.phpt
@@ -85,48 +85,56 @@ Error: 8 - Undefined variable: undefined_var, %s(64)
 Error: 8 - Undefined variable: unset_var, %s(67)
 
 Arg value 0 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(1) "0"
 }
 
 Arg value 1 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(1) "1"
 }
 
 Arg value 12345 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(5) "12345"
 }
 
 Arg value -2345 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(5) "-2345"
 }
 
 Arg value 10.5 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(4) "10.5"
 }
 
 Arg value -10.5 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(5) "-10.5"
 }
 
 Arg value 101234567000 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(12) "101234567000"
 }
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(2) {
   [0]=>
   string(10) "1.07654321"
@@ -135,74 +143,88 @@ array(2) {
 }
 
 Arg value 0.5 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(3) "0.5"
 }
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value Array 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 2 to be string, array given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value 1 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(1) "1"
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value 1 
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(1) "1"
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
@@ -210,16 +232,19 @@ array(1) {
 Error: 4096 - Object of class stdClass could not be converted to string, %s(73)
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 Error: 2 - spliti() expects parameter 2 to be string, object given, %s(74)
 NULL
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(74)
 array(1) {
   [0]=>
   string(0) ""

diff --git a/ext/ereg/tests/spliti_variation_003.phpt b/ext/ereg/tests/spliti_variation_003.phpt
index 7e3f0071c4b19507f41f8a736f5c6a1f1204e4cb..906af4080461fd56a900e324b2cf37f083fbf8d1 100644 (file)
--- a/ext/ereg/tests/spliti_variation_003.phpt
+++ b/ext/ereg/tests/spliti_variation_003.phpt
@@ -82,6 +82,7 @@ echo "Done";
 *** Testing spliti() : usage variations ***
 
 Arg value 10.5 
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(5) {
   [0]=>
   string(1) "1"
@@ -96,107 +97,128 @@ array(5) {
 }
 
 Arg value -10.5 
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value 0.5 
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value Array 
-Error: 2 - spliti() expects parameter 3 to be long, array given, %s.php(73)
+Error: 8192 - Function spliti() is deprecated, %s(73)
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value Array 
-Error: 2 - spliti() expects parameter 3 to be long, array given, %s.php(73)
+Error: 8192 - Function spliti() is deprecated, %s(73)
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value Array 
-Error: 2 - spliti() expects parameter 3 to be long, array given, %s.php(73)
+Error: 8192 - Function spliti() is deprecated, %s(73)
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value Array 
-Error: 2 - spliti() expects parameter 3 to be long, array given, %s.php(73)
+Error: 8192 - Function spliti() is deprecated, %s(73)
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value Array 
-Error: 2 - spliti() expects parameter 3 to be long, array given, %s.php(73)
+Error: 8192 - Function spliti() is deprecated, %s(73)
+Error: 2 - spliti() expects parameter 3 to be long, array given, %s(73)
 NULL
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value 1 
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value 1 
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(73)
 Error: 2 - spliti() expects parameter 3 to be long, string given, %s(73)
 NULL
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(73)
 Error: 2 - spliti() expects parameter 3 to be long, string given, %s(73)
 NULL
 
 Arg value string 
+Error: 8192 - Function spliti() is deprecated, %s(73)
 Error: 2 - spliti() expects parameter 3 to be long, string given, %s(73)
 NULL
 
 Arg value string 
+Error: 8192 - Function spliti() is deprecated, %s(73)
 Error: 2 - spliti() expects parameter 3 to be long, string given, %s(73)
 NULL
 Error: 4096 - Object of class stdClass could not be converted to string, %s(72)
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(73)
 Error: 2 - spliti() expects parameter 3 to be long, object given, %s(73)
 NULL
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
 
 Arg value  
+Error: 8192 - Function spliti() is deprecated, %s(73)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"

diff --git a/ext/ereg/tests/spliti_variation_004.phpt b/ext/ereg/tests/spliti_variation_004.phpt
index 7a331be3672eb822744505bd306baed37b44a4da..e9b33d43340e9942fa6c026894ffe1e3b57c4e51 100644 (file)
--- a/ext/ereg/tests/spliti_variation_004.phpt
+++ b/ext/ereg/tests/spliti_variation_004.phpt
@@ -25,14 +25,17 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing spliti() : usage variations ***
+Error: 8192 - Function spliti() is deprecated, %s(16)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
+Error: 8192 - Function spliti() is deprecated, %s(17)
 array(1) {
   [0]=>
   string(9) "1 2 3 4 5"
 }
+Error: 8192 - Function spliti() is deprecated, %s(18)
 array(5) {
   [0]=>
   string(1) "1"
@@ -45,4 +48,4 @@ array(5) {
   [4]=>
   string(1) "5"
 }
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/sql_regcase_basic_001.phpt b/ext/ereg/tests/sql_regcase_basic_001.phpt
index 7657fa28c703c6f36bd67a4533c2ef934cdef0b1..5a04724b7530228388bd5f8c4d92b9872cd76198 100644 (file)
--- a/ext/ereg/tests/sql_regcase_basic_001.phpt
+++ b/ext/ereg/tests/sql_regcase_basic_001.phpt
@@ -21,5 +21,7 @@ echo "Done";
 ?>
 --EXPECTF--
 *** Testing sql_regcase() : basic functionality ***
+
+Deprecated: Function sql_regcase() is deprecated in %s on line %d
 string(39) "[Ss][Tt][Rr][Ii][Nn][Gg]_[Vv][Aa][Ll]-0"
-Done
\ No newline at end of file
+Done

diff --git a/ext/ereg/tests/sql_regcase_error_001.phpt b/ext/ereg/tests/sql_regcase_error_001.phpt
index 9fb1506004fdfa3d7f897b02f4cf5392f103aa5d..6ac71f27c1ec47474862c723ccaeb4bd22eb5867 100644 (file)
--- a/ext/ereg/tests/sql_regcase_error_001.phpt
+++ b/ext/ereg/tests/sql_regcase_error_001.phpt
@@ -27,11 +27,15 @@ echo "Done";
 
 -- Testing sql_regcase() function with Zero arguments --
 
-Warning: sql_regcase() expects exactly 1 parameter, 0 given in %s.php on line 12
+Deprecated: Function sql_regcase() is deprecated in %s on line %d
+
+Warning: sql_regcase() expects exactly 1 parameter, 0 given in %s on line %d
 NULL
 
 -- Testing sql_regcase() function with more than expected no. of arguments --
 
-Warning: sql_regcase() expects exactly 1 parameter, 2 given in %s.php on line 18
+Deprecated: Function sql_regcase() is deprecated in %s on line %d
+
+Warning: sql_regcase() expects exactly 1 parameter, 2 given in %s on line %d
 NULL
 Done

diff --git a/ext/ereg/tests/sql_regcase_variation_001.phpt b/ext/ereg/tests/sql_regcase_variation_001.phpt
index 2445d6dcab06d3254232a7fcf150016800f160a7..c2c28ab50e2d23bcd7457259488197c586cd1fac 100644 (file)
--- a/ext/ereg/tests/sql_regcase_variation_001.phpt
+++ b/ext/ereg/tests/sql_regcase_variation_001.phpt
@@ -83,84 +83,109 @@ Error: 8 - Undefined variable: undefined_var, %s(62)
 Error: 8 - Undefined variable: unset_var, %s(65)
 
 Arg value 0 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(1) "0"
 
 Arg value 1 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(1) "1"
 
 Arg value 12345 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(5) "12345"
 
 Arg value -2345 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(5) "-2345"
 
 Arg value 10.5 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(4) "10.5"
 
 Arg value -10.5 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(5) "-10.5"
 
 Arg value 101234567000 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(12) "101234567000"
 
 Arg value 1.07654321E-9 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(16) "1.07654321[Ee]-9"
 
 Arg value 0.5 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(3) "0.5"
 
 Arg value Array 
-Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s.php(72)
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
+Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s(72)
 NULL
 
 Arg value Array 
-Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s.php(72)
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
+Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s(72)
 NULL
 
 Arg value Array 
-Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s.php(72)
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
+Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s(72)
 NULL
 
 Arg value Array 
-Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s.php(72)
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
+Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s(72)
 NULL
 
 Arg value Array 
-Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s.php(72)
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
+Error: 2 - sql_regcase() expects parameter 1 to be string, array given, %s(72)
 NULL
 
 Arg value  
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(0) ""
 
 Arg value 1 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(1) "1"
 
 Arg value  
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(0) ""
 
 Arg value 1 
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(1) "1"
 
 Arg value  
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(0) ""
 Error: 4096 - Object of class stdClass could not be converted to string, %s(71)
 
 Arg value  
-Error: 2 - sql_regcase() expects parameter 1 to be string, object given, %s.php(72)
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
+Error: 2 - sql_regcase() expects parameter 1 to be string, object given, %s(72)
 NULL
 
 Arg value  
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(0) ""
 
 Arg value  
+Error: 8192 - Function sql_regcase() is deprecated, %s(72)
 string(0) ""
 Done