moriyoshi               Sun Feb 15 07:10:29 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/standard/tests/strings bug40754.phpt 
                                        strripos_offset.phpt 
                                        strrpos_offset.phpt 
                                        strrpos_variation14.phpt 
                                        strrpos_variation15.phpt 
    /php-src/ext/mbstring/tests bug43840.phpt bug43841.phpt 
                                mb_stripos_variation3.phpt 
                                mb_stripos_variation5_Bug45923.phpt 
                                mb_strpos_variation2.phpt 
                                mb_strpos_variation3.phpt 
                                mb_strpos_variation5.phpt 
                                mb_strripos_variation3_Bug45923.phpt 
                                mb_strripos_variation5_Bug45923.phpt 
                                mb_strrpos_variation3.phpt 
  Log:
  - MFH: Refix bug #43840.
  - MFH: Fix bug #43841.
  - MFH: Remove redundant trailing dots from the error messages.
  - MFH: Fix tests.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40754.phpt?r1=1.1.2.3.2.1&r2=1.1.2.3.2.2&diff_format=u
Index: php-src/ext/standard/tests/strings/bug40754.phpt
diff -u php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.3.2.1 
php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.3.2.2
--- php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.3.2.1        Sun Sep 
30 21:35:52 2007
+++ php-src/ext/standard/tests/strings/bug40754.phpt    Sun Feb 15 07:10:29 2009
@@ -53,10 +53,10 @@
 Warning: stripos(): Offset not contained in string in %s on line %d
 bool(false)
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
-Notice: strripos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strripos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 int(2)
 string(8) "abcdeabc"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strripos_offset.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/ext/standard/tests/strings/strripos_offset.phpt
diff -u php-src/ext/standard/tests/strings/strripos_offset.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strripos_offset.phpt:1.1.2.2.2.1
--- php-src/ext/standard/tests/strings/strripos_offset.phpt:1.1.2.2     Thu May 
10 22:10:43 2007
+++ php-src/ext/standard/tests/strings/strripos_offset.phpt     Sun Feb 15 
07:10:29 2009
@@ -16,30 +16,30 @@
 echo "Done\n";
 ?>
 --EXPECTF--    
-Notice: strripos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strripos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
-Notice: strripos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strripos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
-Notice: strripos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strripos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
-Notice: strripos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strripos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
 Warning: strripos() expects parameter 1 to be string, array given in %s on 
line %d
 bool(false)
 
-Notice: strripos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strripos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
-Notice: strripos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strripos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
-Notice: strripos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strripos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
-Notice: strripos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strripos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_offset.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strrpos_offset.phpt
diff -u php-src/ext/standard/tests/strings/strrpos_offset.phpt:1.1.2.2 
php-src/ext/standard/tests/strings/strrpos_offset.phpt:1.1.2.3
--- php-src/ext/standard/tests/strings/strrpos_offset.phpt:1.1.2.2      Tue Jul 
22 01:10:58 2008
+++ php-src/ext/standard/tests/strings/strrpos_offset.phpt      Sun Feb 15 
07:10:29 2009
@@ -15,27 +15,27 @@
 echo "Done\n";
 ?>
 --EXPECTF--    
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 Done
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation14.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strrpos_variation14.phpt
diff -u php-src/ext/standard/tests/strings/strrpos_variation14.phpt:1.1.4.2 
php-src/ext/standard/tests/strings/strrpos_variation14.phpt:1.1.4.3
--- php-src/ext/standard/tests/strings/strrpos_variation14.phpt:1.1.4.2 Fri Oct 
 5 18:33:24 2007
+++ php-src/ext/standard/tests/strings/strrpos_variation14.phpt Sun Feb 15 
07:10:29 2009
@@ -92,7 +92,7 @@
 int(6)
 -- Iteration 3 --
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 -- Iteration 4 --
 int(6)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/strrpos_variation15.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/strings/strrpos_variation15.phpt
diff -u php-src/ext/standard/tests/strings/strrpos_variation15.phpt:1.1.4.2 
php-src/ext/standard/tests/strings/strrpos_variation15.phpt:1.1.4.3
--- php-src/ext/standard/tests/strings/strrpos_variation15.phpt:1.1.4.2 Fri Oct 
 5 18:33:24 2007
+++ php-src/ext/standard/tests/strings/strrpos_variation15.phpt Sun Feb 15 
07:10:29 2009
@@ -94,23 +94,23 @@
 bool(false)
 -- Iteration 3 --
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 -- Iteration 4 --
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 -- Iteration 5 --
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 -- Iteration 6 --
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 -- Iteration 7 --
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 -- Iteration 8 --
 bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug43840.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/mbstring/tests/bug43840.phpt
diff -u php-src/ext/mbstring/tests/bug43840.phpt:1.1.4.2 
php-src/ext/mbstring/tests/bug43840.phpt:1.1.4.3
--- php-src/ext/mbstring/tests/bug43840.phpt:1.1.4.2    Fri Dec  5 13:10:48 2008
+++ php-src/ext/mbstring/tests/bug43840.phpt    Sun Feb 15 07:10:29 2009
@@ -47,29 +47,29 @@
 -- Offset is 22 --
 --Multibyte String:--
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 --ASCII String:--
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Offset is 53 --
 --Multibyte String:--
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 --ASCII String:--
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Offset is 54 --
 --Multibyte String:--
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 --ASCII String:--
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
-bool(false)
\ No newline at end of file
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
+bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/bug43841.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/mbstring/tests/bug43841.phpt
diff -u php-src/ext/mbstring/tests/bug43841.phpt:1.1.2.2 
php-src/ext/mbstring/tests/bug43841.phpt:1.1.2.3
--- php-src/ext/mbstring/tests/bug43841.phpt:1.1.2.2    Wed Dec 10 10:34:15 2008
+++ php-src/ext/mbstring/tests/bug43841.phpt    Sun Feb 15 07:10:29 2009
@@ -1,6 +1,5 @@
 --TEST--
 Test mb_strrpos() function : mb_strrpos offset is byte count for negative 
values
---XFAIL--
 --SKIPIF--
 <?php
 extension_loaded('mbstring') or die('skip');
@@ -40,31 +39,31 @@
 -- Offset is -25 --
 Multibyte String:
 
-Notice: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
+Warning: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 ASCII String:
 mb_strrpos:
 
-Notice: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
+Warning: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 strrpos:
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
 -- Offset is -24 --
 Multibyte String:
 
-Notice: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
+Warning: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 ASCII String:
 mb_strrpos:
 
-Notice: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
+Warning: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 strrpos:
 
-Notice: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
+Warning: strrpos(): Offset is greater than the length of haystack string in %s 
on line %d
 bool(false)
 
 -- Offset is -13 --
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_stripos_variation3.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/mbstring/tests/mb_stripos_variation3.phpt
diff -u php-src/ext/mbstring/tests/mb_stripos_variation3.phpt:1.1.2.3 
php-src/ext/mbstring/tests/mb_stripos_variation3.phpt:1.1.2.4
--- php-src/ext/mbstring/tests/mb_stripos_variation3.phpt:1.1.2.3       Fri Dec 
 5 13:10:46 2008
+++ php-src/ext/mbstring/tests/mb_stripos_variation3.phpt       Sun Feb 15 
07:10:29 2009
@@ -115,12 +115,12 @@
 
 -- Iteration 3 --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Iteration 4 --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Iteration 5 --
@@ -128,12 +128,12 @@
 
 -- Iteration 6 --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Iteration 7 --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Iteration 8 --
@@ -200,4 +200,4 @@
 
 Warning: mb_stripos() expects parameter 3 to be long, resource given in %s on 
line %d
 bool(false)
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt
diff -u php-src/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt:1.1.2.1 
php-src/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt:1.1.2.2
--- php-src/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt:1.1.2.1      
Fri Dec  5 13:10:48 2008
+++ php-src/ext/mbstring/tests/mb_stripos_variation5_Bug45923.phpt      Sun Feb 
15 07:10:29 2009
@@ -51,11 +51,11 @@
 **-- Offset is: -10 --**
 -- ASCII String --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 
 **-- Offset is: 0 --**
@@ -79,35 +79,41 @@
 **-- Offset is: 30 --**
 -- ASCII String --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
+
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 
 **-- Offset is: 40 --**
 -- ASCII String --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
+
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 
 **-- Offset is: 50 --**
 -- ASCII String --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
+
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 
 **-- Offset is: 60 --**
 -- ASCII String --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
 
-Warning: mb_stripos(): Offset not contained in string. in %s on line %d
+Warning: mb_stripos(): Offset not contained in string in %s on line %d
 bool(false)
 Done
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_variation2.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strpos_variation2.phpt
diff -u php-src/ext/mbstring/tests/mb_strpos_variation2.phpt:1.1.4.4 
php-src/ext/mbstring/tests/mb_strpos_variation2.phpt:1.1.4.5
--- php-src/ext/mbstring/tests/mb_strpos_variation2.phpt:1.1.4.4        Fri Dec 
 5 13:10:47 2008
+++ php-src/ext/mbstring/tests/mb_strpos_variation2.phpt        Sun Feb 15 
07:10:29 2009
@@ -135,12 +135,12 @@
 
 -- Iteration 10 --
 
-Warning: mb_strpos(): Empty delimiter. in %s on line %d
+Warning: mb_strpos(): Empty delimiter in %s on line %d
 bool(false)
 
 -- Iteration 11 --
 
-Warning: mb_strpos(): Empty delimiter. in %s on line %d
+Warning: mb_strpos(): Empty delimiter in %s on line %d
 bool(false)
 
 -- Iteration 12 --
@@ -148,7 +148,7 @@
 
 -- Iteration 13 --
 
-Warning: mb_strpos(): Empty delimiter. in %s on line %d
+Warning: mb_strpos(): Empty delimiter in %s on line %d
 bool(false)
 
 -- Iteration 14 --
@@ -156,17 +156,17 @@
 
 -- Iteration 15 --
 
-Warning: mb_strpos(): Empty delimiter. in %s on line %d
+Warning: mb_strpos(): Empty delimiter in %s on line %d
 bool(false)
 
 -- Iteration 16 --
 
-Warning: mb_strpos(): Empty delimiter. in %s on line %d
+Warning: mb_strpos(): Empty delimiter in %s on line %d
 bool(false)
 
 -- Iteration 17 --
 
-Warning: mb_strpos(): Empty delimiter. in %s on line %d
+Warning: mb_strpos(): Empty delimiter in %s on line %d
 bool(false)
 
 -- Iteration 18 --
@@ -183,16 +183,16 @@
 
 -- Iteration 22 --
 
-Warning: mb_strpos(): Empty delimiter. in %s on line %d
+Warning: mb_strpos(): Empty delimiter in %s on line %d
 bool(false)
 
 -- Iteration 23 --
 
-Warning: mb_strpos(): Empty delimiter. in %s on line %d
+Warning: mb_strpos(): Empty delimiter in %s on line %d
 bool(false)
 
 -- Iteration 24 --
 
 Warning: mb_strpos() expects parameter 2 to be string, resource given in %s on 
line %d
 bool(false)
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_variation3.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strpos_variation3.phpt
diff -u php-src/ext/mbstring/tests/mb_strpos_variation3.phpt:1.1.4.4 
php-src/ext/mbstring/tests/mb_strpos_variation3.phpt:1.1.4.5
--- php-src/ext/mbstring/tests/mb_strpos_variation3.phpt:1.1.4.4        Fri Dec 
 5 13:10:46 2008
+++ php-src/ext/mbstring/tests/mb_strpos_variation3.phpt        Sun Feb 15 
07:10:29 2009
@@ -114,12 +114,12 @@
 
 -- Iteration 3 --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Iteration 4 --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Iteration 5 --
@@ -127,12 +127,12 @@
 
 -- Iteration 6 --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Iteration 7 --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 -- Iteration 8 --
@@ -199,4 +199,4 @@
 
 Warning: mb_strpos() expects parameter 3 to be long, resource given in %s on 
line %d
 bool(false)
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strpos_variation5.phpt?r1=1.2.4.2&r2=1.2.4.3&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strpos_variation5.phpt
diff -u php-src/ext/mbstring/tests/mb_strpos_variation5.phpt:1.2.4.2 
php-src/ext/mbstring/tests/mb_strpos_variation5.phpt:1.2.4.3
--- php-src/ext/mbstring/tests/mb_strpos_variation5.phpt:1.2.4.2        Fri Dec 
 5 13:10:47 2008
+++ php-src/ext/mbstring/tests/mb_strpos_variation5.phpt        Sun Feb 15 
07:10:29 2009
@@ -50,11 +50,11 @@
 **-- Offset is: -10 --**
 -- ASCII String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 **-- Offset is: 0 --**
@@ -78,40 +78,40 @@
 **-- Offset is: 30 --**
 -- ASCII String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 **-- Offset is: 40 --**
 -- ASCII String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 **-- Offset is: 50 --**
 -- ASCII String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 
 **-- Offset is: 60 --**
 -- ASCII String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
 --Multibyte String --
 
-Warning: mb_strpos(): Offset not contained in string. in %s on line %d
+Warning: mb_strpos(): Offset not contained in string in %s on line %d
 bool(false)
-Done
\ No newline at end of file
+Done
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt
diff -u php-src/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt:1.1.2.1 
php-src/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt:1.1.2.2
--- php-src/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt:1.1.2.1     
Fri Dec  5 13:10:46 2008
+++ php-src/ext/mbstring/tests/mb_strripos_variation3_Bug45923.phpt     Sun Feb 
15 07:10:29 2009
@@ -114,18 +114,28 @@
 int(8)
 
 -- Iteration 3 --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 
 -- Iteration 4 --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 
 -- Iteration 5 --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 
 -- Iteration 6 --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 
 -- Iteration 7 --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 
 -- Iteration 8 --
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt
diff -u php-src/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt:1.1.2.1 
php-src/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt:1.1.2.2
--- php-src/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt:1.1.2.1     
Fri Dec  5 13:10:48 2008
+++ php-src/ext/mbstring/tests/mb_strripos_variation5_Bug45923.phpt     Sun Feb 
15 07:10:29 2009
@@ -50,9 +50,9 @@
 
 **-- Offset is: -10 --**
 -- ASCII String --
-bool(false)
+int(9)
 --Multibyte String --
-bool(false)
+int(9)
 
 **-- Offset is: 0 --**
 -- ASCII String --
@@ -74,26 +74,42 @@
 
 **-- Offset is: 30 --**
 -- ASCII String --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 --Multibyte String --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 
 **-- Offset is: 40 --**
 -- ASCII String --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 --Multibyte String --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 
 **-- Offset is: 50 --**
 -- ASCII String --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 --Multibyte String --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 
 **-- Offset is: 60 --**
 -- ASCII String --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 --Multibyte String --
+
+Warning: mb_strripos(): Offset is greater than the length of haystack string 
in %s on line %d
 bool(false)
 Done
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt?r1=1.1.4.4&r2=1.1.4.5&diff_format=u
Index: php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt
diff -u php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt:1.1.4.4 
php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt:1.1.4.5
--- php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt:1.1.4.4       Fri Dec 
 5 13:10:47 2008
+++ php-src/ext/mbstring/tests/mb_strrpos_variation3.phpt       Sun Feb 15 
07:10:29 2009
@@ -97,12 +97,12 @@
 
 -- Iteration 3 --
 
-Notice: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
+Warning: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
 -- Iteration 4 --
 
-Notice: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
+Warning: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
 -- Iteration 5 --
@@ -113,7 +113,7 @@
 
 -- Iteration 7 --
 
-Notice: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
+Warning: mb_strrpos(): Offset is greater than the length of haystack string in 
%s on line %d
 bool(false)
 
 -- Iteration 8 --
@@ -150,4 +150,4 @@
 
 -- Iteration 18 --
 int(8)
-Done
\ No newline at end of file
+Done

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to