Skip to content

Commit

Permalink
Remove extra blank in notice message, should act as same as vm
Browse files Browse the repository at this point in the history
  • Loading branch information
@laruence
laruence committed Sep 1, 2012
1 parent 863e7e0 commit f3108b5
Show file tree
Hide file tree
Showing 18 changed files with 56 additions and 56 deletions.
14 changes: 7 additions & 7 deletions ext/spl/spl_array.c
View file
Expand Up @@ -323,13 +323,13 @@ static zval **spl_array_get_dimension_ptr_ptr(int check_inherited, zval *object,
if (zend_symtable_find(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **) &retval) == FAILURE) {
switch (type) {
case BP_VAR_R:
zend_error(E_NOTICE, "Undefined index: %s", Z_STRVAL_P(offset));
zend_error(E_NOTICE, "Undefined index: %s", Z_STRVAL_P(offset));
case BP_VAR_UNSET:
case BP_VAR_IS:
retval = &EG(uninitialized_zval_ptr);
break;
case BP_VAR_RW:
zend_error(E_NOTICE,"Undefined index: %s", Z_STRVAL_P(offset));
zend_error(E_NOTICE,"Undefined index: %s", Z_STRVAL_P(offset));
case BP_VAR_W: {
zval *value;
ALLOC_INIT_ZVAL(value);
Expand All @@ -351,13 +351,13 @@ static zval **spl_array_get_dimension_ptr_ptr(int check_inherited, zval *object,
if (zend_hash_index_find(ht, index, (void **) &retval) == FAILURE) {
switch (type) {
case BP_VAR_R:
zend_error(E_NOTICE, "Undefined offset: %ld", index);
zend_error(E_NOTICE, "Undefined offset: %ld", index);
case BP_VAR_UNSET:
case BP_VAR_IS:
retval = &EG(uninitialized_zval_ptr);
break;
case BP_VAR_RW:
zend_error(E_NOTICE, "Undefined offset: %ld", index);
zend_error(E_NOTICE, "Undefined offset: %ld", index);
case BP_VAR_W: {
zval *value;
ALLOC_INIT_ZVAL(value);
Expand Down Expand Up @@ -520,11 +520,11 @@ static void spl_array_unset_dimension_ex(int check_inherited, zval *object, zval
}
if (ht == &EG(symbol_table)) {
if (zend_delete_global_variable(Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC)) {
zend_error(E_NOTICE,"Undefined index: %s", Z_STRVAL_P(offset));
zend_error(E_NOTICE,"Undefined index: %s", Z_STRVAL_P(offset));
}
} else {
if (zend_symtable_del(ht, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1) == FAILURE) {
zend_error(E_NOTICE,"Undefined index: %s", Z_STRVAL_P(offset));
zend_error(E_NOTICE,"Undefined index: %s", Z_STRVAL_P(offset));
} else {
spl_array_object *obj = intern;

Expand Down Expand Up @@ -570,7 +570,7 @@ static void spl_array_unset_dimension_ex(int check_inherited, zval *object, zval
return;
}
if (zend_hash_index_del(ht, index) == FAILURE) {
zend_error(E_NOTICE,"Undefined offset: %ld", Z_LVAL_P(offset));
zend_error(E_NOTICE,"Undefined offset: %ld", Z_LVAL_P(offset));
}
break;
default:
Expand Down
2 changes: 1 addition & 1 deletion ext/spl/spl_iterators.c
View file
Expand Up @@ -2820,7 +2820,7 @@ SPL_METHOD(CachingIterator, offsetGet)
}

if (zend_symtable_find(HASH_OF(intern->u.caching.zcache), arKey, nKeyLength+1, (void**)&value) == FAILURE) {
zend_error(E_NOTICE, "Undefined index: %s", arKey);
zend_error(E_NOTICE, "Undefined index: %s", arKey);
return;
}

Expand Down
4 changes: 2 additions & 2 deletions ext/spl/tests/arrayObject___construct_basic2.phpt
View file
Expand Up @@ -63,7 +63,7 @@ bool(true)

Notice: Undefined property: ArrayObject::$prop in %s on line 40

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40
NULL
NULL
- After:
Expand Down Expand Up @@ -91,7 +91,7 @@ bool(true)

Notice: Undefined property: MyArrayObject::$prop in %s on line 40

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40
NULL
NULL
- After:
Expand Down
4 changes: 2 additions & 2 deletions ext/spl/tests/arrayObject___construct_basic3.phpt
View file
Expand Up @@ -63,7 +63,7 @@ bool(true)

Notice: Undefined property: ArrayObject::$prop in %s on line 40

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40
NULL
NULL
- After:
Expand Down Expand Up @@ -91,7 +91,7 @@ bool(true)

Notice: Undefined property: MyArrayObject::$prop in %s on line 40

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40
NULL
NULL
- After:
Expand Down
10 changes: 5 additions & 5 deletions ext/spl/tests/arrayObject___construct_basic4.phpt
View file
Expand Up @@ -61,11 +61,11 @@ bool(true)
bool(true)
- Unset:

Notice: Undefined index: prop in %s on line 39
Notice: Undefined index: prop in %s on line 39

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40
NULL
NULL
- After:
Expand All @@ -91,9 +91,9 @@ bool(true)
bool(true)
- Unset:

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40
NULL
NULL
- After:
Expand Down
10 changes: 5 additions & 5 deletions ext/spl/tests/arrayObject___construct_basic5.phpt
View file
Expand Up @@ -61,11 +61,11 @@ bool(true)
bool(true)
- Unset:

Notice: Undefined index: prop in %s on line 39
Notice: Undefined index: prop in %s on line 39

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40
NULL
NULL
- After:
Expand All @@ -91,9 +91,9 @@ bool(true)
bool(true)
- Unset:

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40

Notice: Undefined index: prop in %s on line 40
Notice: Undefined index: prop in %s on line 40
NULL
NULL
- After:
Expand Down
4 changes: 2 additions & 2 deletions ext/spl/tests/arrayObject_magicMethods1.phpt
View file
Expand Up @@ -102,7 +102,7 @@ object(ArrayObject)#2 (1) {
--> Read existent, non-existent and dynamic:
string(7) "changed"

Notice: Undefined index: nonexistent in %s on line 42
Notice: Undefined index: nonexistent in %s on line 42
NULL
string(11) "new.changed"
Original wrapped object:
Expand Down Expand Up @@ -171,7 +171,7 @@ object(ArrayObject)#2 (1) {

--> Unset existent, non-existent and dynamic:

Notice: Undefined index: nonexistent in %s on line 60
Notice: Undefined index: nonexistent in %s on line 60
Original wrapped object:
object(UsesMagic)#1 (3) {
["b"]=>
Expand Down
4 changes: 2 additions & 2 deletions ext/spl/tests/arrayObject_magicMethods3.phpt
View file
Expand Up @@ -102,7 +102,7 @@ object(ArrayObject)#2 (1) {
--> Read existent, non-existent and dynamic:
string(7) "changed"

Notice: Undefined index: nonexistent in %s on line 42
Notice: Undefined index: nonexistent in %s on line 42
NULL
string(11) "new.changed"
Original wrapped object:
Expand Down Expand Up @@ -171,7 +171,7 @@ object(ArrayObject)#2 (1) {

--> Unset existent, non-existent and dynamic:

Notice: Undefined index: nonexistent in %s on line 60
Notice: Undefined index: nonexistent in %s on line 60
Original wrapped object:
object(UsesMagic)#1 (3) {
["b"]=>
Expand Down
4 changes: 2 additions & 2 deletions ext/spl/tests/arrayObject_magicMethods4.phpt
View file
Expand Up @@ -107,7 +107,7 @@ object(UsesMagic)#2 (2) {
--> Read existent, non-existent and dynamic:
string(7) "changed"

Notice: Undefined index: nonexistent in %s on line 45
Notice: Undefined index: nonexistent in %s on line 45
NULL
string(11) "new.changed"
Original wrapped object:
Expand Down Expand Up @@ -180,7 +180,7 @@ object(UsesMagic)#2 (2) {

--> Unset existent, non-existent and dynamic:

Notice: Undefined index: nonexistent in %s on line 63
Notice: Undefined index: nonexistent in %s on line 63
Original wrapped object:
object(C)#1 (3) {
["b"]=>
Expand Down
4 changes: 2 additions & 2 deletions ext/spl/tests/arrayObject_magicMethods6.phpt
View file
Expand Up @@ -107,7 +107,7 @@ object(UsesMagic)#2 (2) {
--> Read existent, non-existent and dynamic:
string(7) "changed"

Notice: Undefined index: nonexistent in %s on line 45
Notice: Undefined index: nonexistent in %s on line 45
NULL
string(11) "new.changed"
Original wrapped object:
Expand Down Expand Up @@ -180,7 +180,7 @@ object(UsesMagic)#2 (2) {

--> Unset existent, non-existent and dynamic:

Notice: Undefined index: nonexistent in %s on line 63
Notice: Undefined index: nonexistent in %s on line 63
Original wrapped object:
object(C)#1 (3) {
["b"]=>
Expand Down
4 changes: 2 additions & 2 deletions ext/spl/tests/arrayObject_setFlags_basic1.phpt
View file
Expand Up @@ -44,8 +44,8 @@ string(21) "array element.changed"
--> Remove the array element and try access again:
bool(false)

Notice: Undefined index: p in %s on line 10
Notice: Undefined index: p in %s on line 10
NULL

Notice: Undefined index: p in %s on line 12
Notice: Undefined index: p in %s on line 12
string(8) ".changed"
8 changes: 4 additions & 4 deletions ext/spl/tests/array_001.phpt
View file
Expand Up @@ -79,15 +79,15 @@ object(ArrayObject)#%d (1) {
}
int(0)

Notice: Undefined offset: 6 in %sarray_001.php on line %d
Notice: Undefined offset: 6 in %sarray_001.php on line %d
NULL

Notice: Undefined index: b in %sarray_001.php on line %d
Notice: Undefined index: b in %sarray_001.php on line %d
NULL

Notice: Undefined offset: 7 in %sarray_001.php on line %d
Notice: Undefined offset: 7 in %sarray_001.php on line %d

Notice: Undefined index: c in %sarray_001.php on line %d
Notice: Undefined index: c in %sarray_001.php on line %d
object(ArrayObject)#%d (1) {
["storage":"ArrayObject":private]=>
array(2) {
Expand Down
8 changes: 4 additions & 4 deletions ext/spl/tests/array_010.phpt
View file
Expand Up @@ -94,10 +94,10 @@ int(1)
string(3) "3rd"
int(4)

Notice: Undefined index: 5th in %sarray_010.php on line %d
Notice: Undefined index: 5th in %sarray_010.php on line %d
NULL

Notice: Undefined offset: 6 in %sarray_010.php on line %d
Notice: Undefined offset: 6 in %sarray_010.php on line %d
NULL
===offsetSet===
WRITE 1
Expand Down Expand Up @@ -128,9 +128,9 @@ array(6) {
string(9) "changed 6"
}

Notice: Undefined offset: 7 in %sarray_010.php on line %d
Notice: Undefined offset: 7 in %sarray_010.php on line %d

Notice: Undefined index: 8th in %sarray_010.php on line %d
Notice: Undefined index: 8th in %sarray_010.php on line %d
array(4) {
[0]=>
string(3) "1st"
Expand Down
2 changes: 1 addition & 1 deletion ext/spl/tests/bug45622.phpt
View file
Expand Up @@ -42,7 +42,7 @@ bool(true)
--> Remove the array element and try access again:
bool(false)

Notice: Undefined index: p in %s on line %d
Notice: Undefined index: p in %s on line %d
NULL

--> Re-add the real property:
Expand Down
4 changes: 2 additions & 2 deletions ext/spl/tests/bug45622b.phpt
View file
Expand Up @@ -25,9 +25,9 @@ isset($ao->prop4);
--EXPECTF--
Doesn't trigger __get.

Notice: Undefined index: prop1 in %s on line 11
Notice: Undefined index: prop1 in %s on line 11
Doesn't trigger __set.
Doesn't trigger __unset.

Notice: Undefined index: prop3 in %s on line 17
Notice: Undefined index: prop3 in %s on line 17
Shouldn't trigger __isset.
2 changes: 1 addition & 1 deletion ext/spl/tests/bug54323.phpt
View file
Expand Up @@ -19,6 +19,6 @@ function testAccess($c, $ao) {
--EXPECTF--
Notice: Undefined property: C::$prop in %sbug54323.php on line 14

Notice: Undefined index: prop in %sbug54323.php on line 14
Notice: Undefined index: prop in %sbug54323.php on line 14
NULL
NULL
8 changes: 4 additions & 4 deletions ext/spl/tests/bug62978.phpt
View file
Expand Up @@ -25,7 +25,7 @@ var_dump($a[$fp]);

fclose($fp);
--EXPECTF--
Notice: Undefined index: epic_magic in %sbug62978.php on line %d
Notice: Undefined index: epic_magic in %sbug62978.php on line %d
NULL

Notice: Undefined index: epic_magic in %sbug62978.php on line %d
Expand All @@ -34,17 +34,17 @@ NULL
Notice: Undefined variable: c in %sbug62978.php on line %d
NULL

Notice: Undefined index: epic_magic in %sbug62978.php on line %d
Notice: Undefined index: epic_magic in %sbug62978.php on line %d
NULL

Notice: Undefined index: epic_magic in %sbug62978.php on line %d
NULL

Notice: Undefined index: epic_magic in %sbug62978.php on line %d
Notice: Undefined index: epic_magic in %sbug62978.php on line %d
NULL
bool(false)

Strict Standards: Resource ID#%d used as offset, casting to integer (%d) in %sbug62978.php on line %d

Notice: Undefined offset: %d in %sbug62978.php on line %d
Notice: Undefined offset: %d in %sbug62978.php on line %d
NULL

0 comments on commit f3108b5

Please sign in to comment.