diff options
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/tests/traits/bugs/overridding-conflicting-methods.phpt | 2 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 2 | ||||
| -rw-r--r-- | Zend/zend_compile.c | 6 | ||||
| -rw-r--r-- | Zend/zend_execute_API.c | 2 | ||||
| -rw-r--r-- | Zend/zend_globals.h | 2 | ||||
| -rw-r--r-- | Zend/zend_language_scanner.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt index fc09a367bd..0bbea11005 100644 --- a/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt +++ b/Zend/tests/traits/bugs/overridding-conflicting-methods.phpt @@ -1,5 +1,5 @@ --TEST-- -Overridding Conflicting Methods should not result in a notice/warning about collisions +Overriding Conflicting Methods should not result in a notice/warning about collisions --FILE-- <?php error_reporting(E_ALL); diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index dc496e9ed5..72d905848a 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -2396,7 +2396,7 @@ ZEND_API void zend_fetch_debug_backtrace(zval *return_value, int skip_last, int MAKE_STD_ZVAL(arg_array); array_init(arg_array); - /* include_filename always points to the last filename of the last last called-fuction. + /* include_filename always points to the last filename of the last last called-function. if we have called include in the frame above - this is the file we have included. */ diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index f5609fe620..326d4ef976 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1723,7 +1723,7 @@ void zend_do_begin_function_declaration(znode *function_token, znode *function_n } { - /* Push a seperator to the switch and foreach stacks */ + /* Push a separator to the switch and foreach stacks */ zend_switch_entry switch_entry; switch_entry.cond.op_type = IS_UNUSED; @@ -1817,7 +1817,7 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /* CG(active_op_array) = function_token->u.op_array; - /* Pop the switch and foreach seperators */ + /* Pop the switch and foreach separators */ zend_stack_del_top(&CG(switch_cond_stack)); zend_stack_del_top(&CG(foreach_copy_stack)); } @@ -2584,7 +2584,7 @@ static int generate_free_foreach_copy(const zend_op *foreach_copy TSRMLS_DC) /* { zend_op *opline; - /* If we reach the seperator then stop applying the stack */ + /* If we reach the separator then stop applying the stack */ if (foreach_copy->result_type == IS_UNUSED && foreach_copy->op1_type == IS_UNUSED) { return 1; } diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 9bffe9eff8..6fa7e9bafb 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1072,7 +1072,7 @@ ZEND_API int zend_lookup_class_ex(const char *name, int name_length, const zend_ } /* The compiler is not-reentrant. Make sure we __autoload() only during run-time - * (doesn't impact fuctionality of __autoload() + * (doesn't impact functionality of __autoload() */ if (!use_autoload || zend_is_compiling(TSRMLS_C)) { if (!key) { diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h index 58392c199b..646e9c9a60 100644 --- a/Zend/zend_globals.h +++ b/Zend/zend_globals.h @@ -306,7 +306,7 @@ struct _zend_php_scanner_globals { unsigned char *script_filtered; size_t script_filtered_size; - /* input/ouput filters */ + /* input/output filters */ zend_encoding_filter input_filter; zend_encoding_filter output_filter; const zend_encoding *script_encoding; diff --git a/Zend/zend_language_scanner.h b/Zend/zend_language_scanner.h index 826ad7aba6..704547825a 100644 --- a/Zend/zend_language_scanner.h +++ b/Zend/zend_language_scanner.h @@ -44,7 +44,7 @@ typedef struct _zend_lex_state { unsigned char *script_filtered; size_t script_filtered_size; - /* input/ouput filters */ + /* input/output filters */ zend_encoding_filter input_filter; zend_encoding_filter output_filter; const zend_encoding *script_encoding; |