diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-25 01:44:38 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-08-25 01:44:38 +0200 |
| commit | 502fe5d0e557ce51dde3b75cf4783ff8a122ef30 (patch) | |
| tree | 16a725347ec9b79849f0f56857d5fc3036529d5d /ext | |
| parent | 6dccadaac6fe633e2467eb0b46b06dbf3b43cff0 (diff) | |
| parent | 0785a5e6dc6789a34cff4a35cc570587acda025a (diff) | |
| download | php-git-502fe5d0e557ce51dde3b75cf4783ff8a122ef30.tar.gz | |
Merge branch 'pull-request/2094'
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pdo/tests/pecl_bug_5217.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/mysql_pdo_test.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/pdo/tests/pecl_bug_5217.phpt b/ext/pdo/tests/pecl_bug_5217.phpt index 34de925e41..7fe2bf4af7 100644 --- a/ext/pdo/tests/pecl_bug_5217.phpt +++ b/ext/pdo/tests/pecl_bug_5217.phpt @@ -1,5 +1,5 @@ --TEST-- -PDO Common: PECL Bug #5217 (serialize/unserialze safety) +PDO Common: PECL Bug #5217 (serialize/unserialize safety) --SKIPIF-- <?php # vim:ft=php if (!extension_loaded('pdo')) die('skip'); diff --git a/ext/pdo_mysql/tests/mysql_pdo_test.inc b/ext/pdo_mysql/tests/mysql_pdo_test.inc index 7a97bb4630..4e953ed7e1 100644 --- a/ext/pdo_mysql/tests/mysql_pdo_test.inc +++ b/ext/pdo_mysql/tests/mysql_pdo_test.inc @@ -55,7 +55,7 @@ class MySQLPDOTest extends PDOTest { strpos(PDO_MYSQL_TEST_DSN, ':') + 1, strlen(PDO_MYSQL_TEST_DSN)); - // no real parser - any excotic setting can fool us + // no real parser - any exotic setting can fool us $parts = explode(';', $dsn); foreach ($parts as $k => $v) { $tmp = explode('=', $v); |