diff options
| author | Nikita Popov <nikic@php.net> | 2016-11-20 21:24:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-11-20 22:31:24 +0100 |
| commit | 45f7b2bcc8f95e793c1a9bb60da0848860c060fb (patch) | |
| tree | 2a5b25e11e63b1d5f8dad9d1cbd8601364709996 /ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt | |
| parent | 563a341df7c7a74de706d62ab5e4a8a0c2e9152f (diff) | |
| download | php-git-45f7b2bcc8f95e793c1a9bb60da0848860c060fb.tar.gz | |
Fix CRLF line-endings in tests
Also fix a single instance of CRLF in ibase_query.c.
Diffstat (limited to 'ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt')
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt index fb7e9a9d0a..4528213f11 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_connect_charset.phpt @@ -1,33 +1,33 @@ ---TEST--
-PDO_MYSQL: Defining a connection charset in the DSN
---SKIPIF--
-<?php
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
-require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
-MySQLPDOTest::skip();
-?>
---FILE--
-<?php
- require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
-
- /* Connect to mysql to determine the current charset so we can diffinate it */
- $link = MySQLPDOTest::factory();
- $charset = $link->query("SHOW VARIABLES LIKE 'character_set_connection'")->fetchObject()->value;
-
- /* Make sure that we don't attempt to set the current character set to make this case useful */
- $new_charset = ($charset == 'latin1' ? 'ascii' : 'latin1');
-
- /* Done with the original connection, create a second link to test the character set being defined */
- unset($link);
-
- $link = MySQLPDOTest::factory('PDO', false, null, Array('charset' => $new_charset));
- $conn_charset = $link->query("SHOW VARIABLES LIKE 'character_set_connection'")->fetchObject()->value;
-
- if ($charset !== $conn_charset) {
- echo "done!\n";
- } else {
- echo "failed!\n";
- }
-?>
---EXPECTF--
-done!
+--TEST-- +PDO_MYSQL: Defining a connection charset in the DSN +--SKIPIF-- +<?php +require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc'); +require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); +MySQLPDOTest::skip(); +?> +--FILE-- +<?php + require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); + + /* Connect to mysql to determine the current charset so we can diffinate it */ + $link = MySQLPDOTest::factory(); + $charset = $link->query("SHOW VARIABLES LIKE 'character_set_connection'")->fetchObject()->value; + + /* Make sure that we don't attempt to set the current character set to make this case useful */ + $new_charset = ($charset == 'latin1' ? 'ascii' : 'latin1'); + + /* Done with the original connection, create a second link to test the character set being defined */ + unset($link); + + $link = MySQLPDOTest::factory('PDO', false, null, Array('charset' => $new_charset)); + $conn_charset = $link->query("SHOW VARIABLES LIKE 'character_set_connection'")->fetchObject()->value; + + if ($charset !== $conn_charset) { + echo "done!\n"; + } else { + echo "failed!\n"; + } +?> +--EXPECTF-- +done! |