diff options
author | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-07-16 00:01:46 -0300 |
---|---|---|
committer | Gabriel Caruso <carusogabriel34@gmail.com> | 2018-07-16 00:01:46 -0300 |
commit | 49c193eeb35770b99e86b180d88699371607aac9 (patch) | |
tree | 0977432e372e5bb6ecb8048c5b3c5b492250a6f5 | |
parent | 59456974f2c8d27da66d326c337d657b5f6b5d00 (diff) | |
download | php-git-49c193eeb35770b99e86b180d88699371607aac9.tar.gz |
Make more tests run and fix SKIPIF sections
-rw-r--r-- | ext/pdo/tests/pdo_022.phpt | 5 | ||||
-rw-r--r-- | ext/phar/tests/frontcontroller11.phpt | 11 | ||||
-rw-r--r-- | ext/phar/tests/tar/frontcontroller11.phar.phpt | 11 | ||||
-rw-r--r-- | ext/phar/tests/zip/frontcontroller11.phar.phpt | 11 |
4 files changed, 12 insertions, 26 deletions
diff --git a/ext/pdo/tests/pdo_022.phpt b/ext/pdo/tests/pdo_022.phpt index daec14f9ed..28a07994dd 100644 --- a/ext/pdo/tests/pdo_022.phpt +++ b/ext/pdo/tests/pdo_022.phpt @@ -2,7 +2,6 @@ PDO Common: PDOStatement::getColumnMeta --SKIPIF-- <?php # vim:ft=php -die('skip this feature is not yet finalized, no test makes sense'); if (!extension_loaded('pdo')) die('skip'); $dir = getenv('REDIR_TEST_DIR'); if (false == $dir) die('skip no driver'); @@ -18,6 +17,8 @@ PDOTest::skip(); * test file. */ ?> +--XFAIL-- +This feature is not yet finalized, no test makes sense --FILE-- <?php if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/'); @@ -25,7 +26,7 @@ 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), val2 VARCHAR(16))'); -$db->exec('insert2', "INSERT INTO test VALUES(:first, :second, :third)"); +$db->exec('insert2', "INSERT INTO test VALUES(:first, :second, :third)"); $data = array( array('10', 'Abc', 'zxy'), diff --git a/ext/phar/tests/frontcontroller11.phpt b/ext/phar/tests/frontcontroller11.phpt index aa20e19e97..eed93fcc0a 100644 --- a/ext/phar/tests/frontcontroller11.phpt +++ b/ext/phar/tests/frontcontroller11.phpt @@ -3,8 +3,7 @@ Phar front controller mime type extension is not a string --INI-- default_charset= --SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip"); ?> -<?php die("skip"); ?> +<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?> --ENV-- SCRIPT_NAME=/frontcontroller11.php REQUEST_URI=/frontcontroller11.php/a.php @@ -13,9 +12,5 @@ PATH_INFO=/a.php files/frontcontroller5.phar --EXPECTHEADERS-- Content-type: text/html ---EXPECTF-- -Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.php:2 -Stack trace: -#0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array) -#1 {main} - thrown in %sfrontcontroller11.php on line 2
\ No newline at end of file +--EXPECT-- +hio diff --git a/ext/phar/tests/tar/frontcontroller11.phar.phpt b/ext/phar/tests/tar/frontcontroller11.phar.phpt index 4b8c29dd1b..2db9e474fc 100644 --- a/ext/phar/tests/tar/frontcontroller11.phar.phpt +++ b/ext/phar/tests/tar/frontcontroller11.phar.phpt @@ -3,8 +3,7 @@ Phar front controller mime type extension is not a string tar-based --INI-- default_charset= --SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip"); ?> -<?php die("skip"); ?> +<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?> --ENV-- SCRIPT_NAME=/frontcontroller11.phar.php REQUEST_URI=/frontcontroller11.phar.php/a.php @@ -13,9 +12,5 @@ PATH_INFO=/a.php files/frontcontroller5.phar.tar --EXPECTHEADERS-- Content-type: text/html ---EXPECTF-- -Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.phar.php:2 -Stack trace: -#0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) -#1 {main} - thrown in %sfrontcontroller11.phar.php on line 2
\ No newline at end of file +--EXPECT-- +hio diff --git a/ext/phar/tests/zip/frontcontroller11.phar.phpt b/ext/phar/tests/zip/frontcontroller11.phar.phpt index c0c555a1a4..15534d02c5 100644 --- a/ext/phar/tests/zip/frontcontroller11.phar.phpt +++ b/ext/phar/tests/zip/frontcontroller11.phar.phpt @@ -3,9 +3,8 @@ Phar front controller mime type extension is not a string zip-based --INI-- default_charset= --SKIPIF-- -<?php if (!extension_loaded("phar")) die("skip"); ?> +<?php if (!extension_loaded("phar")) die("skip phar extension not loaded"); ?> <?php if (!extension_loaded("zlib")) die("skip zlib not available"); ?> -<?php die("skip"); ?> --ENV-- SCRIPT_NAME=/frontcontroller11.phar.php REQUEST_URI=/frontcontroller11.phar.php/a.php @@ -14,9 +13,5 @@ PATH_INFO=/a.php files/frontcontroller5.phar.zip --EXPECTHEADERS-- Content-type: text/html ---EXPECTF-- -Fatal error: Uncaught PharException: Key of MIME type overrides array must be a file extension, was "0" in %sfrontcontroller11.phar.php:2 -Stack trace: -#0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array) -#1 {main} - thrown in %sfrontcontroller11.phar.php on line 2
\ No newline at end of file +--EXPECT-- +hio |