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

10 files changed, 14 insertions, 12 deletions

diff --git a/Zend/tests/bug37667.phpt b/Zend/tests/bug37667.phpt
index 2647ef09a5..ecf43c5b80 100755
--- 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 9e4416c969..0129d21348 100755
--- 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 b678c53101..0f77104ac1 100644
--- 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 3bc3dae2dd..8074eb1dbd 100644
--- 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 dcc7935a91..9ddae33a1f 100644
--- 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 e06791e61c..f5da018f7b 100644
--- 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 a7e2f21b1c..eba6611e6c 100644
--- 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 82f96d5239..feed3fb8d9 100644
--- 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 fd08eb3946..68640c83f5 100644
--- 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 cce556ceb9..b54f467ea8 100755
--- 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