summaryrefslogtreecommitdiff
path: root/ext/tokenizer
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 /ext/tokenizer
parent65c8edd525108f6598a8bb25fb3c5d6c80233322 (diff)
parent719083bd943e6c287c2dcb47918cf51f89a4ac08 (diff)
downloadphp-git-01554bf3e417f13baf7af874e449c265c0309279.tar.gz
Merge branch 'master' into zppFailOnOverflow
Diffstat (limited to 'ext/tokenizer')
-rw-r--r--ext/tokenizer/tests/token_get_all_variation17.phpt4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/tokenizer/tests/token_get_all_variation17.phpt b/ext/tokenizer/tests/token_get_all_variation17.phpt
index f71444bc1e..d34508a8d5 100644
--- a/ext/tokenizer/tests/token_get_all_variation17.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation17.phpt
@@ -22,7 +22,7 @@ $source = '<?php
function inverse($x)
{
if($x == 0) {
- throw new Exception("Divison by zero");
+ throw new Exception("Division by zero");
else
return 1/$x;
}
@@ -244,7 +244,7 @@ array(81) {
[0]=>
int(%d)
[1]=>
- string(17) ""Divison by zero""
+ string(18) ""Division by zero""
[2]=>
int(5)
}