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

diff --git a/Zend/tests/bug37667.phpt b/Zend/tests/bug37667.phpt
index efcf40f56da1ed7534a36e03929c71fccf943306..cd54b3b2325da3d08ef9a1ea0305bd31aa1b3f0d 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]=>
@@ -54,7 +54,7 @@ object(Test)#%d (1) {
 --UEXPECTF--
 unicode(3) "bar"
 
-Notice: Undefined offset:  2 in %sbug37667.php on line %d
+Notice: Undefined offset: 2 in %sbug37667.php on line %d
 NULL
 object(Test)#%d (1) {
   [u"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 a9740a57ab94a1f2bff105305a67b7a0410bd714..0b445c80cdcad7fa3fec1e398f355c2c4a8536e8 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
@@ -39,7 +39,7 @@ unicode(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 f94a0a36cb4f35ab2c810e557233e82af057bfab..8bbc08589326c54c5e25c68511adbb21bf6018f8 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
@@ -42,7 +42,7 @@ unicode(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 98c2487e81ca10fbd80207927549824f7ce0bacf..99d76966021b87e21d6fa8e2ba19b0c8387b70eb 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
@@ -48,7 +48,7 @@ unicode(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 8a43c0eef1f7b4a7a90e6a607392c7fdf568a3ac..267fbb20b9d25132cebc2cfcb08d4cb6344c92eb 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
@@ -33,7 +33,7 @@ unicode(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 76eb9a676f8426e49fc01375c191da5014ca56bf..68263b3201c49d9444c4a369dba3894a1bc50080 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
@@ -248,11 +248,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 c4048068313849bdd9d689f04a4d2fc303fec192..aa1fd799d6061c0be4b805109cc1a9117cab9288 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
@@ -248,11 +248,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