summaryrefslogtreecommitdiff
path: root/Zend
diff options
context:
space:
mode:
authorVeres Lajos <vlajos@gmail.com>2013-07-13 13:37:04 +0100
committerStanislav Malyshev <stas@php.net>2013-07-15 00:19:49 -0700
commit1b06e0be96774eeb59a59b80476213a8b98a8fdc (patch)
treec4fe348b1f1ca872dbf58a6c643534e92be25715 /Zend
parentd17e8ac32fe1f4bbf92c4bac1826d83d8372df95 (diff)
downloadphp-git-1b06e0be96774eeb59a59b80476213a8b98a8fdc.tar.gz
typo fixes
Diffstat (limited to 'Zend')
-rw-r--r--Zend/README.ZEND_VM2
-rw-r--r--Zend/tests/closure_044.phpt2
-rw-r--r--Zend/zend_compile.c2
-rw-r--r--Zend/zend_vm_gen.php2
4 files changed, 4 insertions, 4 deletions
diff --git a/Zend/README.ZEND_VM b/Zend/README.ZEND_VM
index 15ff6fd86f..de66110d64 100644
--- a/Zend/README.ZEND_VM
+++ b/Zend/README.ZEND_VM
@@ -6,7 +6,7 @@ fields and using different execution methods (call threading, switch threading
and direct threading). As a result ZE2 got more than 20% speedup on raw PHP
code execution (with specialized executor and direct threading execution
method). As in most PHP applications raw execution speed isn't the limiting
-factor but system calls and database callls are, your mileage with this patch
+factor but system calls and database calls are, your mileage with this patch
will vary.
Most parts of the old zend_execute.c go into zend_vm_def.h. Here you can
diff --git a/Zend/tests/closure_044.phpt b/Zend/tests/closure_044.phpt
index d2644c0401..8fdef135dc 100644
--- a/Zend/tests/closure_044.phpt
+++ b/Zend/tests/closure_044.phpt
@@ -3,7 +3,7 @@ Closure 044: Scope/bounding combination invariants; non static closures
--FILE--
<?php
/* A non-static closure has a bound instance if it has a scope
- * and does't have an instance if it has no scope */
+ * and doesn't have an instance if it has no scope */
$nonstaticUnscoped = function () { var_dump(isset(A::$priv)); var_dump(isset($this)); };
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index faef3a9197..196688e46e 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -4108,7 +4108,7 @@ static void zend_traits_init_trait_structures(zend_class_entry *ce TSRMLS_DC) /*
/** With the other traits, we are more permissive.
We do not give errors for those. This allows to be more
defensive in such definitions.
- However, we want to make sure that the insteadof declartion
+ However, we want to make sure that the insteadof declaration
is consistent in itself.
*/
j = 0;
diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index f1afdf0ce1..60ac30e17f 100644
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -1408,7 +1408,7 @@ for ($i = 1; $i < $argc; $i++) {
// Disabling code for old-style executor
define("ZEND_VM_OLD_EXECUTOR", 1);
} else if ($argv[$i] == "--with-lines") {
- // Enabling debuging using original zend_vm_def.h
+ // Enabling debugging using original zend_vm_def.h
define("ZEND_VM_LINES", 1);
} else if ($argv[$i] == "--help") {
usage();