fix typo in the code and related tests

diff --git a/Zend/tests/bug29210.phpt b/Zend/tests/bug29210.phpt
index 16e6e6db162dbd914fe44beb1480c855c0fc240f..a7b9f457f67954ff5cd3e52fe23e84e9789331f6 100644 (file)
--- 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 6038da54ba174862bf260766bc613fddcc393180..c038083775740a2df227aeb05d5ea411b0663d1d 100755 (executable)
--- 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 9d2f192648b438d0de2cfdaaf0b31529a867bf9b..4ae44d79cfb701330924c3942486451b7a8d811a 100644 (file)
--- 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 {