summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndrea Faulds <ajf@ajf.me>2014-11-29 01:45:54 +0000
committerAndrea Faulds <ajf@ajf.me>2014-11-29 01:45:54 +0000
commit01554bf3e417f13baf7af874e449c265c0309279 (patch)
tree8aca46ab27a54cea34c14001af774942f0502e39 /tests
parent65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff)
parent719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff)
downloadphp-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'tests')
-rw-r--r--tests/classes/constants_error_004.phpt2
-rw-r--r--tests/lang/bug20175.phpt2
-rw-r--r--tests/lang/operators/coalesce.phpt2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/classes/constants_error_004.phpt b/tests/classes/constants_error_004.phpt
index 03e67258a6..3f34473dad 100644
--- a/tests/classes/constants_error_004.phpt
+++ b/tests/classes/constants_error_004.phpt
@@ -1,5 +1,5 @@
--TEST--
-Class constant whose initial value refereces a non-existent class
+Class constant whose initial value references a non-existent class
--FILE--
<?php
class C
diff --git a/tests/lang/bug20175.phpt b/tests/lang/bug20175.phpt
index 7c6ec780ed..6cad4f14c2 100644
--- a/tests/lang/bug20175.phpt
+++ b/tests/lang/bug20175.phpt
@@ -35,7 +35,7 @@ function foo_static() {
/* Part 2:
* Storing a reference to the result of a function in a static variable.
* Same as Part 1 but:
- * The return statment transports a copy of the value to return. In other
+ * The return statement transports a copy of the value to return. In other
* words the return value of bar_global() is a temporary variable only valid
* after the function call bar_global() is done in current local scope.
*/
diff --git a/tests/lang/operators/coalesce.phpt b/tests/lang/operators/coalesce.phpt
index 2ee54c5276..4486f30485 100644
--- a/tests/lang/operators/coalesce.phpt
+++ b/tests/lang/operators/coalesce.phpt
@@ -24,7 +24,7 @@ function foobar() {
return ['a'];
}
-var_dump($nonexistant_variable ?? 3);
+var_dump($nonexistent_variable ?? 3);
echo PHP_EOL;
var_dump($var ?? 3);
var_dump($var2 ?? 3);