summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2013-06-20 08:42:30 +0200
committerRemi Collet <remi@php.net>2013-06-20 08:42:30 +0200
commit60afd3fce4071ba79fbabfb828b12ad1421bd2d0 (patch)
treef965b5d3430a73c3151402fc87d57ea274c2214c
parent83fc53acb9e8056ec3a6d9f97cf0c911944dcfe7 (diff)
parent9be591bdb503740ef5d3261422a180e68b9eb3fc (diff)
downloadphp-git-60afd3fce4071ba79fbabfb828b12ad1421bd2d0.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: skip test for bug #64936 when tokenizer not built
-rw-r--r--ext/reflection/tests/bug64936.phpt4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/reflection/tests/bug64936.phpt b/ext/reflection/tests/bug64936.phpt
index 578dc7e4c0..363a17f509 100644
--- a/ext/reflection/tests/bug64936.phpt
+++ b/ext/reflection/tests/bug64936.phpt
@@ -3,6 +3,10 @@ ReflectionMethod::getDocComment() uses left over doc comment from previous scann
--INI--
opcache.save_comments=1
opcache.load_comments=1
+--SKIPIF--
+<?php
+if (!extension_loaded('reflection') || !extension_loaded('tokenizer')) print 'skip missing reflection of tokernizer extension';
+?>
--FILE--
<?php