From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Sun, 15 Feb 2009 07:04:59 +0000 (+0000)
Subject: - Fix tests.
X-Git-Tag: php-5.4.0alpha1~191^2~4273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e2ad13cfced4e1823ba21d23b0ff1239edaa70e;p=php

- Fix tests.
---

diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt
index a3a5cf904f..88225f180a 100644
--- a/ext/standard/tests/strings/bug40754.phpt
+++ b/ext/standard/tests/strings/bug40754.phpt
@@ -53,10 +53,10 @@ bool(false)
 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)
 unicode(8) "abcdeabc"
diff --git a/ext/standard/tests/strings/strripos_offset.phpt b/ext/standard/tests/strings/strripos_offset.phpt
index 14cfccec96..00544c8338 100644
--- a/ext/standard/tests/strings/strripos_offset.phpt
+++ b/ext/standard/tests/strings/strripos_offset.phpt
@@ -16,30 +16,30 @@ var_dump(strripos(1024, "te", -PHP_INT_MAX-1));
 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 (Unicode or binary), 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
diff --git a/ext/standard/tests/strings/strrpos_basic2.phpt b/ext/standard/tests/strings/strrpos_basic2.phpt
index ce1bcb7db4..1a72faf9bb 100644
--- a/ext/standard/tests/strings/strrpos_basic2.phpt
+++ b/ext/standard/tests/strings/strrpos_basic2.phpt
@@ -45,7 +45,7 @@ int(0)
 bool(false)
 int(0)
 
-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)
 int(8)
 int(8)
diff --git a/ext/standard/tests/strings/strrpos_offset.phpt b/ext/standard/tests/strings/strrpos_offset.phpt
index f8843aaf6e..d4c79e9e67 100644
--- a/ext/standard/tests/strings/strrpos_offset.phpt
+++ b/ext/standard/tests/strings/strrpos_offset.phpt
@@ -15,27 +15,27 @@ var_dump(strrpos(1024, "te", -PHP_INT_MAX-1));
 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
diff --git a/ext/standard/tests/strings/strrpos_variation1.phpt b/ext/standard/tests/strings/strrpos_variation1.phpt
index 2e89d7323a..373cf17988 100644
--- a/ext/standard/tests/strings/strrpos_variation1.phpt
+++ b/ext/standard/tests/strings/strrpos_variation1.phpt
@@ -179,6 +179,6 @@ bool(false)
 -- Iteration 35 --
 int(0)
 
-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 ***
diff --git a/ext/standard/tests/strings/strrpos_variation11.phpt b/ext/standard/tests/strings/strrpos_variation11.phpt
index 6e84c7da91..c0b2c04f3e 100644
--- a/ext/standard/tests/strings/strrpos_variation11.phpt
+++ b/ext/standard/tests/strings/strrpos_variation11.phpt
@@ -93,12 +93,12 @@ echo "*** Done ***";
 -- Iteration 1 --
 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)
 -- Iteration 2 --
 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)
 -- Iteration 3 --
 bool(false)
@@ -171,7 +171,7 @@ bool(false)
 -- Iteration 15 --
 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)
 -- Iteration 16 --
 bool(false)
@@ -179,7 +179,7 @@ bool(false)
 -- Iteration 17 --
 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)
 -- Iteration 18 --
 bool(false)
diff --git a/ext/standard/tests/strings/strrpos_variation12.phpt b/ext/standard/tests/strings/strrpos_variation12.phpt
index 187e3373f3..5bfce19e1a 100644
--- a/ext/standard/tests/strings/strrpos_variation12.phpt
+++ b/ext/standard/tests/strings/strrpos_variation12.phpt
@@ -38,7 +38,7 @@ int(11)
 int(11)
 int(2)
 
-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)
 int(5)
 int(5)
@@ -46,6 +46,6 @@ int(0)
 bool(false)
 int(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)
 *** Done ***
diff --git a/ext/standard/tests/strings/strrpos_variation13.phpt b/ext/standard/tests/strings/strrpos_variation13.phpt
index d168e7a2e9..62aea3b7bf 100644
--- a/ext/standard/tests/strings/strrpos_variation13.phpt
+++ b/ext/standard/tests/strings/strrpos_variation13.phpt
@@ -40,11 +40,11 @@ int(12)
 int(12)
 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)
 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)
 int(0)
 bool(false)
diff --git a/ext/standard/tests/strings/strrpos_variation14.phpt b/ext/standard/tests/strings/strrpos_variation14.phpt
index 8edddbf2bb..f48419ecd9 100644
--- a/ext/standard/tests/strings/strrpos_variation14.phpt
+++ b/ext/standard/tests/strings/strrpos_variation14.phpt
@@ -90,11 +90,11 @@ echo "*** Done ***";
 int(6)
 -- Iteration 2 --
 
-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 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)
diff --git a/ext/standard/tests/strings/strrpos_variation15.phpt b/ext/standard/tests/strings/strrpos_variation15.phpt
index 72236e5d24..f4958f3134 100644
--- a/ext/standard/tests/strings/strrpos_variation15.phpt
+++ b/ext/standard/tests/strings/strrpos_variation15.phpt
@@ -92,11 +92,11 @@ echo "*** Done ***";
 bool(false)
 -- Iteration 2 --
 
-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 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 --
 
@@ -104,7 +104,7 @@ Warning: Needle argument codepoint value out of range (0 - 0x10FFFF) in %s on li
 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 --
 
@@ -140,13 +140,13 @@ Warning: strrpos() expects parameter 3 to be long, array given in %s on line %d
 bool(false)
 -- Iteration 15 --
 
-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 16 --
 bool(false)
 -- Iteration 17 --
 
-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 18 --
 bool(false)
diff --git a/ext/standard/tests/strings/strrpos_variation2.phpt b/ext/standard/tests/strings/strrpos_variation2.phpt
index 06322d89b7..4b88363f3a 100644
--- a/ext/standard/tests/strings/strrpos_variation2.phpt
+++ b/ext/standard/tests/strings/strrpos_variation2.phpt
@@ -183,6 +183,6 @@ bool(false)
 -- Iteration 36 --
 int(0)
 
-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 ***
diff --git a/ext/standard/tests/strings/strrpos_variation8.phpt b/ext/standard/tests/strings/strrpos_variation8.phpt
index 440dcd60d6..145d743135 100644
--- a/ext/standard/tests/strings/strrpos_variation8.phpt
+++ b/ext/standard/tests/strings/strrpos_variation8.phpt
@@ -52,14 +52,14 @@ bool(false)
 bool(false)
 -- Iteration 13 --
 
-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 14 --
 
-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 15 --
 
-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 ***