diff options
| author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-02-03 12:24:56 -0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-02-04 16:57:08 +0100 |
| commit | 84488d921b5e01729be4f70f8eba8d52ca0209d2 (patch) | |
| tree | 5d318c778b5fe478dfd0b26e932876d779252c8b /ext/pdo | |
| parent | 3616b6b935ffc67c447d6e60ba654ba3903b9bae (diff) | |
| download | php-git-84488d921b5e01729be4f70f8eba8d52ca0209d2.tar.gz | |
Remove superfluous SKIPIF sections in more tests
Diffstat (limited to 'ext/pdo')
| -rw-r--r-- | ext/pdo/tests/pdo_014.phpt | 8 | ||||
| -rw-r--r-- | ext/pdo/tests/pdo_031.phpt | 6 |
2 files changed, 4 insertions, 10 deletions
diff --git a/ext/pdo/tests/pdo_014.phpt b/ext/pdo/tests/pdo_014.phpt index 7b93fb83a8..46841512a9 100644 --- a/ext/pdo/tests/pdo_014.phpt +++ b/ext/pdo/tests/pdo_014.phpt @@ -3,8 +3,6 @@ PDO Common: PDOStatement SPL iterator --SKIPIF-- <?php # vim:ft=php if (!extension_loaded('pdo')) die('skip'); -if (!extension_loaded('SPL')) die('skip SPL not available'); -if (!class_exists('IteratorIterator', false)) die('skip IteratorIterator class not present'); $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); require_once $dir . 'pdo_test.inc'; @@ -17,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; $db = PDOTest::factory(); $db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))'); -$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); -$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); +$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')'); +$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')'); $SELECT = 'SELECT val, grp FROM test'; class Test @@ -49,7 +47,7 @@ class PDOStatementAggregate extends PDOStatement implements IteratorAggregate private function __construct() { echo __METHOD__ . "\n"; - $this->setFetchMode(PDO::FETCH_NUM); + $this->setFetchMode(PDO::FETCH_NUM); /* default fetch mode is BOTH, so we see if the ctor can overwrite that */ } diff --git a/ext/pdo/tests/pdo_031.phpt b/ext/pdo/tests/pdo_031.phpt index 9065ce9719..11894e9708 100644 --- a/ext/pdo/tests/pdo_031.phpt +++ b/ext/pdo/tests/pdo_031.phpt @@ -3,19 +3,15 @@ PDO Common: PDOStatement SPL iterator --SKIPIF-- <?php # vim:ft=php if (!extension_loaded('pdo')) die('skip'); -if (!extension_loaded('SPL')) die('skip SPL not available'); $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); require_once $dir . 'pdo_test.inc'; -if (!class_exists('RecursiveArrayIterator', false)) die('skip Class RecursiveArrayIterator missing'); -if (!class_exists('RecursiveTreeIterator', false) && !file_exists(getenv('REDIR_TEST_DIR').'../../spl/examples/recursivetreeiterator.inc')) die('skip Class RecursiveTreeIterator missing'); PDOTest::skip(); ?> --FILE-- <?php -if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); +if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc'; -if (!class_exists('RecursiveTreeIterator', false)) require_once(getenv('REDIR_TEST_DIR').'../../spl/examples/recursivetreeiterator.inc'); $data = array( array('10', 'Abc', 'zxy'), |