com php-src: Fixed PHP6 unicode related tests: ext/mysqli/tests /local_infile_tools.inc ext/mysqli/tests/skipifunicode .inc
| From: | Dmitry Stogov | Date: | Fri, 15 Aug 2014 09:22:13 +0000 |
| Subject: | com php-src: Fixed PHP6 unicode related tests: ext/mysqli/tests /local_infile_tools.inc ext/mysqli/tests/skipifunicode .inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80218@lists.php.net to get a copy of this message | ||
Commit: 29893a88e7cdf93f9ce80ce7eaecffb3ef5e30c9
Author: Dmitry Stogov <dmitry@zend.com> Fri, 15 Aug 2014 13:22:13 +0400
Parents: e3de409eac95870cc0323f3e4df32a0435658333
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=29893a88e7cdf93f9ce80ce7eaecffb3ef5e30c9
Log:
Fixed PHP6 unicode related tests
Changed paths:
M ext/mysqli/tests/local_infile_tools.inc
M ext/mysqli/tests/skipifunicode.inc
Diff:
diff --git a/ext/mysqli/tests/local_infile_tools.inc b/ext/mysqli/tests/local_infile_tools.inc
index bb9872f..7b4d9c1 100644
--- a/ext/mysqli/tests/local_infile_tools.inc
+++ b/ext/mysqli/tests/local_infile_tools.inc
@@ -59,7 +59,7 @@
register_shutdown_function("shutdown_clean", $file);
}
- if ((version_compare(PHP_VERSION, '5.9.9', '>') == 1)) {
+ if ((version_compare(PHP_VERSION, '6.0', '==') == 1)) {
if (!fwrite($fp, (binary)"'97';'x';\n") ||
!fwrite($fp, (binary)"'98';'y';\n") ||
!fwrite($fp, (binary)"99;'z';\n")) {
diff --git a/ext/mysqli/tests/skipifunicode.inc b/ext/mysqli/tests/skipifunicode.inc
index da4dd8e..d453363 100644
--- a/ext/mysqli/tests/skipifunicode.inc
+++ b/ext/mysqli/tests/skipifunicode.inc
@@ -1,5 +1,5 @@
<?php
-if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
+if (version_compare(PHP_VERSION, '6.0', '!=') == 1) {
die('skip Not functional with PHP 6 (fomerly PHP 6 && unicode.semantics=On)');
}
?>