summaryrefslogtreecommitdiff
path: root/ext/tokenizer
diff options
context:
space:
mode:
authorLior Kaplan <kaplanlior@gmail.com>2014-02-14 17:15:35 +0200
committerLior Kaplan <kaplanlior@gmail.com>2014-02-14 17:15:35 +0200
commit23d952ed60766be772fe72dcdc61407c6231dc18 (patch)
tree85da0b833c76fddb10fd40db0124af9bd14f772c /ext/tokenizer
parent71b8f59ebba9ec3c5af6d4bd0b5e9dab3803dbe5 (diff)
parentf9829690d4f6e747a8d46751c9d37e5e5e40336c (diff)
downloadphp-git-23d952ed60766be772fe72dcdc61407c6231dc18.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/tokenizer')
-rw-r--r--ext/tokenizer/tests/token_get_all_variation14.phpt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/tokenizer/tests/token_get_all_variation14.phpt b/ext/tokenizer/tests/token_get_all_variation14.phpt
index 5fc390e36c..52d29198c7 100644
--- a/ext/tokenizer/tests/token_get_all_variation14.phpt
+++ b/ext/tokenizer/tests/token_get_all_variation14.phpt
@@ -26,7 +26,7 @@ struct myStruct {
?>';
var_dump( token_get_all($source));
-// with invalid open tag for testing entire source to be unkown token
+// with invalid open tag for testing entire source to be unknown token
echo "-- with invlalid PHP open tag & valid tokens --\n";
$source = '<pli
echo "hello world"; ?>';