moriyoshi Wed Oct 30 02:53:15 2002 EDT
Modified files:
/php4/ext/mbstring/tests mb_ereg-compat-01.phpt
mb_ereg-compat-02.phpt
mb_ereg_replace-compat-01.phpt
mb_ereg_replace-compat-02.phpt
mb_ereg_replace-compat-03.phpt
mb_ereg_replace-compat-04.phpt
mb_ereg_replace-compat-05.phpt
mb_ereg_replace-compat-06.phpt
mb_ereg_replace-compat-07.phpt
mb_ereg_replace-compat-08.phpt
mb_ereg_replace-compat-09.phpt
mb_ereg_replace-compat-10.phpt
mb_ereg_replace-compat-11.phpt
mb_ereg_replace-compat-12.phpt
mb_ereg_replace-compat-13.phpt
mb_split-compat-01.phpt
Log:
Shortened comments. I also think they were too long.
Index: php4/ext/mbstring/tests/mb_ereg-compat-01.phpt
diff -u php4/ext/mbstring/tests/mb_ereg-compat-01.phpt:1.1
php4/ext/mbstring/tests/mb_ereg-compat-01.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg-compat-01.phpt:1.1 Tue Oct 29 14:01:08 2002
+++ php4/ext/mbstring/tests/mb_ereg-compat-01.phpt Wed Oct 30 02:53:15 2002
@@ -1,9 +1,11 @@
--TEST--
-mb_ereg() compatibility test 1 (counterpart: ext/standard/tests/reg/004.phpt)
---POST--
---GET--
+mb_ereg() compat test 1
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="This is a nice and simple string";
+<?php
+/* (counterpart: ext/standard/tests/reg/004.phpt) */
+ $a="This is a nice and simple string";
if (mb_ereg(".*nice and simple.*",$a)) {
echo "ok\n";
}
Index: php4/ext/mbstring/tests/mb_ereg-compat-02.phpt
diff -u php4/ext/mbstring/tests/mb_ereg-compat-02.phpt:1.1
php4/ext/mbstring/tests/mb_ereg-compat-02.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg-compat-02.phpt:1.1 Tue Oct 29 14:01:08 2002
+++ php4/ext/mbstring/tests/mb_ereg-compat-02.phpt Wed Oct 30 02:53:15 2002
@@ -1,9 +1,11 @@
--TEST--
-mb_ereg() compatibility test 2 (counterpart: ext/standard/tests/reg/005.phpt)
---POST--
---GET--
+mb_ereg() compat test 2
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="This is a nice and simple string";
+<?php
+/* (counterpart: ext/standard/tests/reg/005.phpt) */
+ $a="This is a nice and simple string";
echo mb_ereg(".*(is).*(is).*",$a,$registers);
echo "\n";
echo $registers[0];
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt:1.1 Tue Oct 29 14:01:08
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-01.phpt Wed Oct 30 02:53:15
+2002
@@ -1,9 +1,12 @@
--TEST--
-mb_ereg_replace() compatibility test 1 (counterpart: ext/standard/tests/reg/001.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 1
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="abc123";
- echo mb_ereg_replace("123","def",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/001.phpt) */
+ $a="abc123";
+ echo mb_ereg_replace("123","def",$a);
+?>
--EXPECT--
abcdef
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-02.phpt Wed Oct 30 02:53:15
+2002
@@ -1,9 +1,12 @@
--TEST--
-mb_ereg_replace() compatibility test 2 (counterpart: ext/standard/tests/reg/002.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 2
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="abc123";
- echo mb_ereg_replace("123","",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/002.phpt) */
+ $a="abc123";
+ echo mb_ereg_replace("123","",$a);
+?>
--EXPECT--
abc
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-03.phpt Wed Oct 30 02:53:15
+2002
@@ -1,10 +1,12 @@
--TEST--
-mb_ereg_replace() compatibility test 3 (counterpart: ext/standard/tests/reg/003.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 3
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="\\'test";
- echo mb_ereg_replace("\\\\'","'",$a)
+<?php
+/* (counterpart: ext/standard/tests/reg/003.phpt) */
+ $a="\\'test";
+ echo mb_ereg_replace("\\\\'","'",$a);
?>
--EXPECT--
'test
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-04.phpt Wed Oct 30 02:53:15
+2002
@@ -1,9 +1,11 @@
--TEST--
-mb_ereg_replace() compatibility test 4 (counterpart: ext/standard/tests/reg/006.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 4
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="This is a nice and simple string";
+<?php
+/* (counterpart: ext/standard/tests/reg/006.phpt) */
+ $a="This is a nice and simple string";
echo mb_ereg_replace("^This","That",$a);
?>
--EXPECT--
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-05.phpt Wed Oct 30 02:53:15
+2002
@@ -1,12 +1,13 @@
--TEST--
-mb_ereg_replace() compatibility test 5 (counterpart: ext/standard/tests/reg/007.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 5
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
<?php
- $a="abcd";
- $b=mb_ereg_replace("abcd","",$a);
- echo "strlen(\$b)=".strlen($b);
+/* (counterpart: ext/standard/tests/reg/007.phpt) */
+ $a="abcd";
+ $b=mb_ereg_replace("abcd","",$a);
+ echo "strlen(\$b)=".strlen($b);
?>
--EXPECT--
strlen($b)=0
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-06.phpt Wed Oct 30 02:53:15
+2002
@@ -1,10 +1,11 @@
--TEST--
-mb_ereg_replace() compatibility test 6 (counterpart: ext/standard/tests/reg/008.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 6
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
<?php
- echo mb_ereg_replace("([a-z]*)([-=+|]*)([0-9]+)","\\3 \\1 \\2\n","abc+-|=123");
+/* (counterpart: ext/standard/tests/reg/008.phpt) */
+ echo mb_ereg_replace("([a-z]*)([-=+|]*)([0-9]+)","\\3 \\1 \\2\n","abc+-|=123");
?>
--EXPECT--
123 abc +-|=
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-07.phpt Wed Oct 30 02:53:15
+2002
@@ -1,9 +1,12 @@
--TEST--
-mb_ereg_replace() compatibility test 7 (counterpart: ext/standard/tests/reg/010.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 7
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="abc122222222223";
- echo mb_ereg_replace("1(2*)3","\\1def\\1",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/010.phpt) */
+ $a="abc122222222223";
+ echo mb_ereg_replace("1(2*)3","\\1def\\1",$a);
+?>
--EXPECT--
abc2222222222def2222222222
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-08.phpt Wed Oct 30 02:53:15
+2002
@@ -1,9 +1,12 @@
--TEST--
-mb_ereg_replace() compatibility test 8 (counterpart: ext/standard/tests/reg/011.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 8
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="abc123";
- echo mb_ereg_replace("123","def\\0ghi",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/011.phpt) */
+ $a="abc123";
+ echo mb_ereg_replace("123","def\\0ghi",$a);
+?>
--EXPECT--
abcdef123ghi
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-09.phpt Wed Oct 30 02:53:15
+2002
@@ -1,9 +1,12 @@
--TEST--
-mb_ereg_replace() compatibility test 9 (counterpart: ext/standard/tests/reg/012.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 9
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="abc123";
- echo mb_ereg_replace("123",'def\1ghi',$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/012.phpt) */
+ $a="abc123";
+ echo mb_ereg_replace("123",'def\1ghi',$a);
+?>
--EXPECT--
abcdef\1ghi
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-10.phpt Wed Oct 30 02:53:15
+2002
@@ -1,9 +1,12 @@
--TEST--
-mb_ereg_replace() compatibility test 10 (counterpart: ext/standard/tests/reg/013.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 10
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="abc123";
- echo mb_ereg_replace("123","def\\g\\\\hi\\",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/013.phpt) */
+ $a="abc123";
+ echo mb_ereg_replace("123","def\\g\\\\hi\\",$a);
+?>
--EXPECT--
abcdef\g\\hi\
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-11.phpt Wed Oct 30 02:53:15
+2002
@@ -1,9 +1,12 @@
--TEST--
-mb_ereg_replace() compatibility test 11 (counterpart: ext/standard/tests/reg/014.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 11
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php $a="a\\2bxc";
- echo mb_ereg_replace("a(.*)b(.*)c","\\1",$a)?>
+<?php
+/* (counterpart: ext/standard/tests/reg/014.phpt) */
+ $a="a\\2bxc";
+ echo mb_ereg_replace("a(.*)b(.*)c","\\1",$a);
+?>
--EXPECT--
\2
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-12.phpt Wed Oct 30 02:53:15
+2002
@@ -1,8 +1,11 @@
--TEST--
-mb_ereg_replace() compatibility test 12 (counterpart: ext/standard/tests/reg/015.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 12
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php echo mb_ereg_replace("^","z","abc123")?>
+<?php
+/* (counterpart: ext/standard/tests/reg/015.phpt) */
+ echo mb_ereg_replace("^","z","abc123");
+?>
--EXPECT--
zabc123
Index: php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt
diff -u php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt:1.1
php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt:1.2
--- php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt:1.1 Tue Oct 29 14:01:09
2002
+++ php4/ext/mbstring/tests/mb_ereg_replace-compat-13.phpt Wed Oct 30 02:53:15
+2002
@@ -1,8 +1,11 @@
--TEST--
-mb_ereg_replace() compatibility test 13 (counterpart: ext/standard/tests/reg/016.phpt)
---POST--
---GET--
+mb_ereg_replace() compat test 13
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
-<?php echo mb_ereg_replace('\?',"abc","?123?")?>
+<?php
+/* (counterpart: ext/standard/tests/reg/016.phpt) */
+ echo mb_ereg_replace('\?',"abc","?123?");
+?>
--EXPECT--
abc123abc
Index: php4/ext/mbstring/tests/mb_split-compat-01.phpt
diff -u php4/ext/mbstring/tests/mb_split-compat-01.phpt:1.1
php4/ext/mbstring/tests/mb_split-compat-01.phpt:1.2
--- php4/ext/mbstring/tests/mb_split-compat-01.phpt:1.1 Tue Oct 29 14:01:10 2002
+++ php4/ext/mbstring/tests/mb_split-compat-01.phpt Wed Oct 30 02:53:15 2002
@@ -1,9 +1,10 @@
--TEST--
-mb_split() compatibility test 1 (counterpart: ext/standard/tests/reg/009.phpt)
---POST--
---GET--
+mb_split() compat test 1
+--SKIPIF--
+extension_loaded('mbstring') or die('skip');
--FILE--
<?php
+/* (counterpart: ext/standard/tests/reg/009.phpt) */
$a=mb_split("[[:space:]]","this is a
test");
echo count($a) . "\n";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
