summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2017-01-07 02:05:37 +0100
committerAnatol Belski <ab@php.net>2017-01-07 02:05:37 +0100
commitf7bb3b5cbde6008ec139b18a5768dcac60652011 (patch)
tree4f35b87398e04a37e7a54f474632b7569f12efb7
parentb716a1fbefd8a5aa727c23fff3a8acf3b3556e6a (diff)
parent45686180300956756f5d770bb99dda2f2e96a59f (diff)
downloadphp-git-f7bb3b5cbde6008ec139b18a5768dcac60652011.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Revert "Test request47456.phpt for PR 1303" on PHP-7.0 and PHP-7.1
-rw-r--r--ext/pcre/tests/request47456.phpt12
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/pcre/tests/request47456.phpt b/ext/pcre/tests/request47456.phpt
index df054743dd..2ba2627c8d 100644
--- a/ext/pcre/tests/request47456.phpt
+++ b/ext/pcre/tests/request47456.phpt
@@ -34,11 +34,11 @@ array(3) {
["chr"]=>
string(1) "b"
[1]=>
- NULL
+ string(0) ""
["num"]=>
- NULL
+ string(0) ""
[2]=>
- NULL
+ string(0) ""
[3]=>
string(1) "b"
}
@@ -77,11 +77,11 @@ array(3) {
["chr"]=>
string(1) "b"
[1]=>
- NULL
+ string(0) ""
["num"]=>
- NULL
+ string(0) ""
[2]=>
- NULL
+ string(0) ""
[3]=>
string(1) "b"
}