uw Thu Jul 12 14:24:53 2007 UTC
Modified files:
/php-src/ext/mysql/tests mysql_constants.phpt
Log:
Blame me for not checking in a version that's been cleaned up with
regards to Whitespace/CS...
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_constants.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_constants.phpt
diff -u php-src/ext/mysql/tests/mysql_constants.phpt:1.1
php-src/ext/mysql/tests/mysql_constants.phpt:1.2
--- php-src/ext/mysql/tests/mysql_constants.phpt:1.1 Thu Jul 12 14:01:12 2007
+++ php-src/ext/mysql/tests/mysql_constants.phpt Thu Jul 12 14:24:53 2007
@@ -3,60 +3,60 @@
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
-<?php
- require("connect.inc");
- require("table.inc");
-
- $constants = get_defined_constants(true);
- sort($constants);
-
- $expected_constants = array(
- 'MYSQL_ASSOC' => true,
- 'MYSQL_NUM' => true,
- 'MYSQL_BOTH' => true,
- 'MYSQL_CLIENT_COMPRESS' => true,
- 'MYSQL_CLIENT_INTERACTIVE' => true,
- 'MYSQL_CLIENT_IGNORE_SPACE' => true,
- );
-
- $version = mysql_get_server_info($link);
- if (!preg_match('@(\d+)\.(\d+)\.(\d+)@ism', $version, $matches))
- printf("[001] Cannot get server version\n");
- $version = ($matches[1] * 100) + ($matches[2] * 10) + $matches[3];
-
- if ($version > 400) {
- $expected_constants = array_merge($expected_constants, array(
- "MYSQL_CLIENT_SSL" => true,
- ));
- }
-
-
- $unexpected_constants = array();
-
- foreach ($constants as $group => $consts) {
- foreach ($consts as $name => $value) {
- if (stristr($name, 'mysql') && !stristr($name, 'mysqli')) {
- $name = strtoupper($name);
- if (isset($expected_constants[$name])) {
- unset($expected_constants[$name]);
- } else {
- $unexpected_constants[$name] = $name;
- }
- }
- }
- }
-
- if (!empty($unexpected_constants)) {
- printf("Dumping list of unexpected constants\n");
- var_dump($unexpected_constants);
- }
-
- if (!empty($expected_constants)) {
- printf("Dumping list of missing constants\n");
- var_dump($expected_constants);
- }
+<?php
+require("connect.inc");
+require("table.inc");
- print "done!";
+$constants = get_defined_constants(true);
+sort($constants);
+
+$expected_constants = array(
+ 'MYSQL_ASSOC' => true,
+ 'MYSQL_NUM' => true,
+ 'MYSQL_BOTH' => true,
+ 'MYSQL_CLIENT_COMPRESS' => true,
+ 'MYSQL_CLIENT_INTERACTIVE' => true,
+ 'MYSQL_CLIENT_IGNORE_SPACE' => true,
+);
+
+$version = mysql_get_server_info($link);
+if (!preg_match('@(\d+)\.(\d+)\.(\d+)@ism', $version, $matches))
+ printf("[001] Cannot get server version\n");
+$version = ($matches[1] * 100) + ($matches[2] * 10) + $matches[3];
+
+if ($version > 400) {
+ $expected_constants = array_merge($expected_constants, array(
+ "MYSQL_CLIENT_SSL" =>
true,
+ ));
+}
+
+
+$unexpected_constants = array();
+
+foreach ($constants as $group => $consts) {
+ foreach ($consts as $name => $value) {
+ if (stristr($name, 'mysql') && !stristr($name, 'mysqli')) {
+ $name = strtoupper($name);
+ if (isset($expected_constants[$name])) {
+ unset($expected_constants[$name]);
+ } else {
+ $unexpected_constants[$name] = $name;
+ }
+ }
+ }
+}
+
+if (!empty($unexpected_constants)) {
+ printf("Dumping list of unexpected constants\n");
+ var_dump($unexpected_constants);
+}
+
+if (!empty($expected_constants)) {
+ printf("Dumping list of missing constants\n");
+ var_dump($expected_constants);
+}
+
+print "done!";
?>
--EXPECTF--
done!
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
