summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorVeres Lajos <vlajos@gmail.com>2014-11-19 19:59:31 +0000
committerVeres Lajos <vlajos@gmail.com>2014-11-19 20:23:00 +0000
commit4b9535341addcdeaf44002e323733864325b30ab (patch)
tree4c5819be9e7939c00b4d60261751b78c6f1d82cc /Zend
parentf7674519804dc7000a56ef9fe12c49461ff0333a (diff)
downloadphp-git-4b9535341addcdeaf44002e323733864325b30ab.tar.gz
typo fixes - https://github.com/vlajos/misspell_fixer
Diffstat (limited to 'Zend')
-rw-r--r--Zend/ZEND_CHANGES2
-rw-r--r--Zend/tests/bug21478.phpt2
-rw-r--r--Zend/tests/bug33512.phpt2
-rw-r--r--Zend/tests/bug40809.phpt2
-rw-r--r--Zend/tests/bug43200.phpt2
-rw-r--r--Zend/tests/bug43200_2.phpt2
-rw-r--r--Zend/tests/debug_backtrace_with_include_and_this.phpt8
-rw-r--r--Zend/tests/traits/bug54441.phpt2
-rw-r--r--Zend/tests/try_finally_010.phpt2
-rw-r--r--Zend/tests/varSyntax/tempDimFetchByRefError.phpt2
-rw-r--r--Zend/zend_alloc.c4
-rw-r--r--Zend/zend_float.h2
-rw-r--r--Zend/zend_gc.c8
-rw-r--r--Zend/zend_inheritance.c4
-rw-r--r--Zend/zend_object_handlers.c4
15 files changed, 24 insertions, 24 deletions
diff --git a/Zend/ZEND_CHANGES b/Zend/ZEND_CHANGES
index afb3595595..94e164c290 100644
--- a/Zend/ZEND_CHANGES
+++ b/Zend/ZEND_CHANGES
@@ -1103,7 +1103,7 @@ Changes in the Zend Engine 1.0
Use ob_start() to begin output buffering, ob_end_flush() to end
buffering and send out the buffered contents, ob_end_clean() to
end buffering without sending the buffered contents, and
- ob_get_contents() to retreive the current contents of the output
+ ob_get_contents() to retrieve the current contents of the output
buffer. Header information (header(), content type, cookies) are
not buffered. By turning on output buffering, you can
effectively send header information all throughout your file,
diff --git a/Zend/tests/bug21478.phpt b/Zend/tests/bug21478.phpt
index 8b38f24d6e..5955c4c1dc 100644
--- a/Zend/tests/bug21478.phpt
+++ b/Zend/tests/bug21478.phpt
@@ -27,7 +27,7 @@ stream_filter_append($fp, "myfilter");
fwrite($fp, "This is a test.\n");
print "Done.\n";
fclose($fp);
-// Uncommenting the following 'print' line causes the segfault to stop occuring
+// Uncommenting the following 'print' line causes the segfault to stop occurring
// print "2\n";
readfile(dirname(__FILE__)."/test.txt");
unlink(dirname(__FILE__)."/test.txt");
diff --git a/Zend/tests/bug33512.phpt b/Zend/tests/bug33512.phpt
index 9dd4e4e5f9..dcb8f0417e 100644
--- a/Zend/tests/bug33512.phpt
+++ b/Zend/tests/bug33512.phpt
@@ -53,7 +53,7 @@ class TheObj {
unset($SomeObj->Virtual1);
unset($SomeObj->{'Virtual'.(3)});
- //but, these variables are still available??? eventhough they're "unset"-ed
+ //but, these variables are still available??? even though they're "unset"-ed
print $SomeObj->Virtual1."\n";
print $SomeObj->{'Virtual'.(3)}."\n";
?>
diff --git a/Zend/tests/bug40809.phpt b/Zend/tests/bug40809.phpt
index 08fc89f553..9ff4e6f1b6 100644
--- a/Zend/tests/bug40809.phpt
+++ b/Zend/tests/bug40809.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #40809 (Poor perfomance of ".=")
+Bug #40809 (Poor performance of ".=")
--FILE--
<?php
error_reporting(E_ALL|E_STRICT);
diff --git a/Zend/tests/bug43200.phpt b/Zend/tests/bug43200.phpt
index 24a8bbb1d7..7a995aab3e 100644
--- a/Zend/tests/bug43200.phpt
+++ b/Zend/tests/bug43200.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #43200 (Interface implementation / inheritence not possible in abstract classes)
+Bug #43200 (Interface implementation / inheritance not possible in abstract classes)
--FILE--
<?php
diff --git a/Zend/tests/bug43200_2.phpt b/Zend/tests/bug43200_2.phpt
index 5efc5facff..3c8a98bddc 100644
--- a/Zend/tests/bug43200_2.phpt
+++ b/Zend/tests/bug43200_2.phpt
@@ -1,5 +1,5 @@
--TEST--
-Bug #43200.2 (Interface implementation / inheritence not possible in abstract classes)
+Bug #43200.2 (Interface implementation / inheritance not possible in abstract classes)
--FILE--
<?php
diff --git a/Zend/tests/debug_backtrace_with_include_and_this.phpt b/Zend/tests/debug_backtrace_with_include_and_this.phpt
index 171ad9f451..2827ab1b74 100644
--- a/Zend/tests/debug_backtrace_with_include_and_this.phpt
+++ b/Zend/tests/debug_backtrace_with_include_and_this.phpt
@@ -23,15 +23,15 @@ set_error_handler(function($code, $msg, $file, $line) {
});
try {
- (new CL())->load('class://non.existant.Class');
+ (new CL())->load('class://non.existent.Class');
} catch (CLException $e) {
echo $e."\n";
}
--EXPECTF--
-ERR#2: include(class://non.existant.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include
-ERR#2: include(): Failed opening 'class://non.existant.Class' for inclusion (include_path='%s') @ include
+ERR#2: include(class://non.existent.Class): failed to open stream: "CLWrapper::stream_open" call failed @ include
+ERR#2: include(): Failed opening 'class://non.existent.Class' for inclusion (include_path='%s') @ include
-Fatal error: Uncaught exception 'Exception' with message 'Failed loading class://non.existant.Class' in %s
+Fatal error: Uncaught exception 'Exception' with message 'Failed loading class://non.existent.Class' in %s
Stack trace:
#0 %s(%d): CL->load('class://non.exi...')
#1 {main}
diff --git a/Zend/tests/traits/bug54441.phpt b/Zend/tests/traits/bug54441.phpt
index 84139f326b..3fe688b3b1 100644
--- a/Zend/tests/traits/bug54441.phpt
+++ b/Zend/tests/traits/bug54441.phpt
@@ -16,4 +16,4 @@ class Boo {
?>
--EXPECTF--
-Fatal error: The modifiers for the trait alias dontKnow() need to be changed in the same statment in which the alias is defined. Error in %s on line %d
+Fatal error: The modifiers for the trait alias dontKnow() need to be changed in the same statement in which the alias is defined. Error in %s on line %d
diff --git a/Zend/tests/try_finally_010.phpt b/Zend/tests/try_finally_010.phpt
index bbac8dd1e5..91eb7821ee 100644
--- a/Zend/tests/try_finally_010.phpt
+++ b/Zend/tests/try_finally_010.phpt
@@ -1,5 +1,5 @@
--TEST--
-Try finally (function call in the finaly block after exception)
+Try finally (function call in the finally block after exception)
--FILE--
<?php
function foo() {
diff --git a/Zend/tests/varSyntax/tempDimFetchByRefError.phpt b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt
index dbcac75ea9..492627302f 100644
--- a/Zend/tests/varSyntax/tempDimFetchByRefError.phpt
+++ b/Zend/tests/varSyntax/tempDimFetchByRefError.phpt
@@ -1,5 +1,5 @@
--TEST--
-Passing a dimention fetch on a temporary by reference is not allowed
+Passing a dimension fetch on a temporary by reference is not allowed
--FILE--
<?php
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 588657d8b4..9d5e079dfa 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -30,7 +30,7 @@
* performed using mmap(). The result is aligned on 2M boundary.
*
* Large - a number of 4096K pages inside a CHUNK. Large blocks
- * are always alligned on page boundary.
+ * are always aligned on page boundary.
*
* Small - less than 3/4 of page size. Small sizes are rounded up to nearest
* greater predefined small size (there are 30 predefined sizes:
@@ -272,7 +272,7 @@ struct _zend_mm_page {
};
/*
- * bin - is one or few continuous pages (up to 8) used for alocation of
+ * bin - is one or few continuous pages (up to 8) used for allocation of
* a particular "small size".
*/
struct _zend_mm_bin {
diff --git a/Zend/zend_float.h b/Zend/zend_float.h
index 33f8e93fbf..e3bb72e580 100644
--- a/Zend/zend_float.h
+++ b/Zend/zend_float.h
@@ -53,7 +53,7 @@ extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D);
Implementation notes:
x86_64:
- - Since all x86_64 compilers use SSE by default, it is probably unecessary
+ - Since all x86_64 compilers use SSE by default, it is probably unnecessary
to use these macros there. We define them anyway since we are too lazy
to differentiate the architecture. Also, the compiler option -mfpmath=i387
justifies this decision.
diff --git a/Zend/zend_gc.c b/Zend/zend_gc.c
index b331f979fd..e47b5350d4 100644
--- a/Zend/zend_gc.c
+++ b/Zend/zend_gc.c
@@ -469,7 +469,7 @@ tail_call:
ht = NULL;
GC_SET_BLACK(GC_INFO(ref));
- /* don't count references for compatibilty ??? */
+ /* don't count references for compatibility ??? */
if (GC_TYPE(ref) != IS_REFERENCE) {
count++;
}
@@ -515,7 +515,7 @@ tail_call:
ZVAL_OBJ(&tmp, obj);
props = get_gc(&tmp, &table, &n TSRMLS_CC);
while (n > 0 && !Z_REFCOUNTED(table[n-1])) {
- /* count non-refcounted for compatibilty ??? */
+ /* count non-refcounted for compatibility ??? */
if (Z_TYPE(table[n-1]) != IS_UNDEF) {
count++;
}
@@ -532,7 +532,7 @@ tail_call:
} else {
count += gc_collect_white(ref TSRMLS_CC);
}
- /* count non-refcounted for compatibilty ??? */
+ /* count non-refcounted for compatibility ??? */
} else if (Z_TYPE(table[i]) != IS_UNDEF) {
count++;
}
@@ -563,7 +563,7 @@ tail_call:
for (idx = 0; idx < ht->nNumUsed; idx++) {
p = ht->arData + idx;
if (!Z_REFCOUNTED(p->val)) {
- /* count non-refcounted for compatibilty ??? */
+ /* count non-refcounted for compatibility ??? */
if (Z_TYPE(p->val) != IS_UNDEF && Z_TYPE(p->val) != IS_INDIRECT) {
count++;
}
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index 7d9d1aade8..d577ba524c 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -1206,7 +1206,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
}
zend_check_trait_usage(ce, cur_precedence->trait_method->ce TSRMLS_CC);
- /** Ensure that the prefered method is actually available. */
+ /** Ensure that the preferred method is actually available. */
lcname = zend_string_alloc(cur_method_ref->method_name->len, 0);
zend_str_tolower_copy(lcname->val,
cur_method_ref->method_name->val,
@@ -1507,7 +1507,7 @@ static void zend_do_check_for_inconsistent_traits_aliasing(zend_class_entry *ce
lc_method_name)) {
zend_string_free(lc_method_name);
zend_error_noreturn(E_COMPILE_ERROR,
- "The modifiers for the trait alias %s() need to be changed in the same statment in which the alias is defined. Error",
+ "The modifiers for the trait alias %s() need to be changed in the same statement in which the alias is defined. Error",
cur_alias->trait_method->method_name->val);
} else {
zend_string_free(lc_method_name);
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index ad5a55510b..af2ba2d708 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -184,7 +184,7 @@ static void zend_std_call_getter(zval *object, zval *member, zval *retval TSRMLS
/* __get handler is called with one argument:
property name
- it should return whether the call was successfull or not
+ it should return whether the call was successful or not
*/
if (Z_REFCOUNTED_P(member)) Z_ADDREF_P(member);
@@ -207,7 +207,7 @@ static int zend_std_call_setter(zval *object, zval *member, zval *value TSRMLS_D
property name
value to be set
- it should return whether the call was successfull or not
+ it should return whether the call was successful or not
*/
zend_call_method_with_2_params(object, ce, &ce->__set, ZEND_SET_FUNC_NAME, &retval, member, value);