From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 15 Aug 2014 09:22:13 +0000 (+0400)
Subject: Fixed PHP6 unicode related tests
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29893a88e7cdf93f9ce80ce7eaecffb3ef5e30c9;p=php

Fixed PHP6 unicode related tests
---

diff --git a/ext/mysqli/tests/local_infile_tools.inc b/ext/mysqli/tests/local_infile_tools.inc
index bb9872f1ab..7b4d9c12a9 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 da4dd8e6fd..d453363d2e 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)');
 }
 ?>