diff options
| -rw-r--r-- | Zend/tests/bug29210.phpt | 8 | ||||
| -rwxr-xr-x | Zend/tests/bug32290.phpt | 4 | ||||
| -rw-r--r-- | Zend/zend_API.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Zend/tests/bug29210.phpt b/Zend/tests/bug29210.phpt index 16e6e6db16..a7b9f457f6 100644 --- a/Zend/tests/bug29210.phpt +++ b/Zend/tests/bug29210.phpt @@ -93,10 +93,10 @@ $object->test(); test_func1 test_func2 -Strict Standards: Non-static method test_class::test_func3() canot be called statically, assuming $this from compatible context test_class in %sbug29210.php on line %d +Strict Standards: Non-static method test_class::test_func3() cannot be called statically, assuming $this from compatible context test_class in %sbug29210.php on line %d test_func3 -Strict Standards: Non-static method test_class::test_func4() canot be called statically, assuming $this from compatible context test_class in %sbug29210.php on line %d +Strict Standards: Non-static method test_class::test_func4() cannot be called statically, assuming $this from compatible context test_class in %sbug29210.php on line %d test_func4 test_func1 isn't callable from outside test_func2 isn't callable from outside @@ -105,8 +105,8 @@ test_func4 isn't callable from outside test_func1 isn't callable from child test_func2 -Strict Standards: Non-static method test_class::test_func3() canot be called statically, assuming $this from compatible context foo in %sbug29210.php on line %d +Strict Standards: Non-static method test_class::test_func3() cannot be called statically, assuming $this from compatible context foo in %sbug29210.php on line %d test_func3 isn't callable from child -Strict Standards: Non-static method test_class::test_func4() canot be called statically, assuming $this from compatible context foo in %sbug29210.php on line %d +Strict Standards: Non-static method test_class::test_func4() cannot be called statically, assuming $this from compatible context foo in %sbug29210.php on line %d test_func4 diff --git a/Zend/tests/bug32290.phpt b/Zend/tests/bug32290.phpt index 6038da54ba..c038083775 100755 --- a/Zend/tests/bug32290.phpt +++ b/Zend/tests/bug32290.phpt @@ -98,7 +98,7 @@ var_dump($x->doSomethingStatic(1)); ===A=== TestB::doSomething(1) -Strict Standards: Non-static method TestA::doSomething() canot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d +Strict Standards: Non-static method TestA::doSomething() cannot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d TestA::doSomething(2) int(1) @@ -110,7 +110,7 @@ int(1) ===C=== TestB::doSomethingParent(1) -Strict Standards: Non-static method TestA::doSomethingParent() canot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d +Strict Standards: Non-static method TestA::doSomethingParent() cannot be called statically, assuming $this from compatible context TestB in %sbug32290.php on line %d TestA::doSomethingParent(2) int(1) diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 9d2f192648..4ae44d79cf 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2135,7 +2135,7 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, uint check_flags, char ** if (EG(This)) { if (instanceof_function(Z_OBJCE_P(EG(This)), ce TSRMLS_CC)) { *zobj_ptr_ptr = &EG(This); - zend_error(E_STRICT, "Non-static method %s::%s() canot be called statically, assuming $this from compatible context %s", ce->name, Z_STRVAL_PP(method), Z_OBJCE_P(EG(This))->name); + zend_error(E_STRICT, "Non-static method %s::%s() cannot be called statically, assuming $this from compatible context %s", ce->name, Z_STRVAL_PP(method), Z_OBJCE_P(EG(This))->name); } } } else { |