Fix tests (removed space on error message "Undefined index: ...")

diff --git a/Zend/tests/bug37667.phpt b/Zend/tests/bug37667.phpt
index 2647ef09a5005e4028514c8e00b2e13775918586..ecf43c5b80b3a9424f416aabcf012f785749cb87 100755 (executable)
--- a/Zend/tests/bug37667.phpt
+++ b/Zend/tests/bug37667.phpt
@@ -30,7 +30,7 @@ var_dump($obj);
 --EXPECTF--
 string(3) "bar"
 
-Notice: Undefined offset:  2 in %sbug37667.php on line 16
+Notice: Undefined offset: 2 in %sbug37667.php on line 16
 NULL
 object(Test)#%d (1) {
   ["property":protected]=>

diff --git a/Zend/tests/bug39304.phpt b/Zend/tests/bug39304.phpt
index 9e4416c9698261c1d2355bdc7f5bea870861e40d..0129d213488b3ff56798f3684ccb12617f502dee 100755 (executable)
--- a/Zend/tests/bug39304.phpt
+++ b/Zend/tests/bug39304.phpt
@@ -6,4 +6,6 @@ Bug #39304 (Segmentation fault with list unpacking of string offset)
   list($a, $b) = $s[0];
 ?>
 --EXPECTF--
+Notice: Uninitialized string offset: 0 in %sbug39304.php on line 3
+
 Fatal error: Cannot use string offset as an array in %sbug39304.php on line 3

diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals_001.phpt
index b678c5310154a68717fcafd50b3e959bc40c23bf..0f77104ac10a17aa110511d63db76b8f935007e1 100644 (file)
--- a/Zend/tests/globals_001.phpt
+++ b/Zend/tests/globals_001.phpt
@@ -26,7 +26,7 @@ string(5) "array"
 int(%d)
 string(%d) "%s"
 
-Notice: Undefined index:  PHP_SELF in %s on line %d
+Notice: Undefined index: PHP_SELF in %s on line %d
 NULL
 
 Notice: Undefined variable: _SERVER in %s on line %d

diff --git a/Zend/tests/globals_002.phpt b/Zend/tests/globals_002.phpt
index 3bc3dae2dda665d80f463d5e2101167fcff77f77..8074eb1dbdd378c684a92187c7257bf623e7685d 100644 (file)
--- a/Zend/tests/globals_002.phpt
+++ b/Zend/tests/globals_002.phpt
@@ -29,7 +29,7 @@ string(5) "array"
 int(%d)
 string(%d) "%s"
 
-Notice: Undefined index:  PHP_SELF in %s on line %d
+Notice: Undefined index: PHP_SELF in %s on line %d
 NULL
 
 Notice: Undefined variable: _SERVER in %s on line %d

diff --git a/Zend/tests/globals_003.phpt b/Zend/tests/globals_003.phpt
index dcc7935a91eae6ff4484db8be29465a97e2f2ead..9ddae33a1f3e33fd43879bb213ac8269767fe94f 100644 (file)
--- a/Zend/tests/globals_003.phpt
+++ b/Zend/tests/globals_003.phpt
@@ -35,7 +35,7 @@ string(5) "array"
 int(%d)
 string(%d) "%s"
 
-Notice: Undefined index:  PHP_SELF in %s on line %d
+Notice: Undefined index: PHP_SELF in %s on line %d
 NULL
 
 Notice: Undefined variable: _SERVER in %s on line %d

diff --git a/Zend/tests/globals_004.phpt b/Zend/tests/globals_004.phpt
index e06791e61ca22fd3eadc60e2ea5274562faf4723..f5da018f7b21c478e7da74f9fcfb4652a5da95b2 100644 (file)
--- a/Zend/tests/globals_004.phpt
+++ b/Zend/tests/globals_004.phpt
@@ -20,7 +20,7 @@ string(5) "array"
 int(%d)
 string(%d) "%s"
 
-Notice: Undefined index:  PHP_SELF in %s on line %d
+Notice: Undefined index: PHP_SELF in %s on line %d
 NULL
 
 Notice: Undefined variable: _SERVER in %s on line %d

diff --git a/Zend/tests/offset_array.phpt b/Zend/tests/offset_array.phpt
index a7e2f21b1c23f3724cffb3b2cbad42e6b6ce6e9f..eba6611e6ca89a654747318afe22e47c141bf00c 100644 (file)
--- a/Zend/tests/offset_array.phpt
+++ b/Zend/tests/offset_array.phpt
@@ -28,10 +28,10 @@ echo "Done\n";
 int(2)
 int(1)
 
-Notice: Undefined index:   in %s on line %d
+Notice: Undefined index:  in %s on line %d
 NULL
 
-Notice: Undefined index:  run away in %s on line %d
+Notice: Undefined index: run away in %s on line %d
 NULL
 int(2)
 int(1)

diff --git a/tests/classes/array_access_001.phpt b/tests/classes/array_access_001.phpt
index 82f96d5239f108e81b9c1732e227ef5e80222c50..feed3fb8d9ddfe0edfcc545ec94d0160ecccba4b 100644 (file)
--- a/tests/classes/array_access_001.phpt
+++ b/tests/classes/array_access_001.phpt
@@ -135,11 +135,11 @@ object::offsetGet(4th)
 int(4)
 object::offsetGet(5th)
 
-Notice: Undefined index:  5th in %sarray_access_001.php on line %d
+Notice: Undefined index: 5th in %sarray_access_001.php on line %d
 NULL
 object::offsetGet(6)
 
-Notice: Undefined offset:  6 in %sarray_access_001.php on line %d
+Notice: Undefined offset: 6 in %sarray_access_001.php on line %d
 NULL
 ===offsetSet===
 WRITE 1

diff --git a/tests/classes/array_access_002.phpt b/tests/classes/array_access_002.phpt
index fd08eb39465a9b0e92dd830c34723f5dbce93e93..68640c83f57626ca9e5d5ec499ed12884f552f7c 100644 (file)
--- a/tests/classes/array_access_002.phpt
+++ b/tests/classes/array_access_002.phpt
@@ -135,11 +135,11 @@ object::offsetGet(4th)
 int(4)
 object::offsetGet(5th)
 
-Notice: Undefined index:  5th in %sarray_access_002.php on line %d
+Notice: Undefined index: 5th in %sarray_access_002.php on line %d
 NULL
 object::offsetGet(6)
 
-Notice: Undefined offset:  6 in %sarray_access_002.php on line %d
+Notice: Undefined offset: 6 in %sarray_access_002.php on line %d
 NULL
 ===offsetSet===
 WRITE 1

diff --git a/tests/lang/bug25547.phpt b/tests/lang/bug25547.phpt
index cce556ceb9ae998296c8ac73d6db6834fc3cd7e9..b54f467ea8752ce8068724d3a86efff88d0c9adb 100755 (executable)
--- a/tests/lang/bug25547.phpt
+++ b/tests/lang/bug25547.phpt
@@ -22,7 +22,7 @@ print_r($output);
 echo "Done";
 ?>
 --EXPECT--
-handler(Undefined index:  foo)
+handler(Undefined index: foo)
 Array
 (
     [foo] => 1