diff options
| author | Anatol Belski <ab@php.net> | 2014-02-04 10:35:19 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-02-04 10:35:19 +0100 |
| commit | f27eaa1578d216c1a6e00d8e6fc424cc079f1eae (patch) | |
| tree | 7185d998d02c41b2ca48a4d54a66e2c2511e9c21 | |
| parent | 2e8e2db82aa0ee78c0707f0768dc6285b31b0a15 (diff) | |
| parent | f2d42e16241055ebf405b346fe3681912ce82aaa (diff) | |
| download | php-git-f27eaa1578d216c1a6e00d8e6fc424cc079f1eae.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
pcre tests go with 8.34 upgrade
| -rw-r--r-- | ext/pcre/tests/bug37911.phpt | 2 | ||||
| -rw-r--r-- | ext/pcre/tests/grep2.phpt | 10 | ||||
| -rw-r--r-- | ext/pcre/tests/match_flags3.phpt | 2 |
3 files changed, 10 insertions, 4 deletions
diff --git a/ext/pcre/tests/bug37911.phpt b/ext/pcre/tests/bug37911.phpt index f7881191b7..2b7481a464 100644 --- a/ext/pcre/tests/bug37911.phpt +++ b/ext/pcre/tests/bug37911.phpt @@ -37,5 +37,5 @@ array(3) { string(4) "blub" } -Warning: preg_replace_callback(): Numeric named subpatterns are not allowed in %sbug37911.php on line 14 +Warning: preg_replace_callback(): Compilation failed: group name must start with a non-digit at offset %d in %sbug37911.php on line %d NULL diff --git a/ext/pcre/tests/grep2.phpt b/ext/pcre/tests/grep2.phpt index 0cf8d4aebc..1a8476c396 100644 --- a/ext/pcre/tests/grep2.phpt +++ b/ext/pcre/tests/grep2.phpt @@ -40,6 +40,12 @@ array(1) { string(1) "1" } bool(true) -array(0) { +array(3) { + [5]=> + string(1) "a" + ["xyz"]=> + string(2) "q6" + [6]=> + string(3) "h20" } -bool(true) +bool(false) diff --git a/ext/pcre/tests/match_flags3.phpt b/ext/pcre/tests/match_flags3.phpt index f22205e3d8..84deb0b80c 100644 --- a/ext/pcre/tests/match_flags3.phpt +++ b/ext/pcre/tests/match_flags3.phpt @@ -42,5 +42,5 @@ array(1) { } } -Warning: preg_match(): Numeric named subpatterns are not allowed in %smatch_flags3.php on line 14 +Warning: preg_match(): Compilation failed: group name must start with a non-digit at offset %d in %smatch_flags3.php on line %d bool(false) |