Support all possible configurations and simplify includes

diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt
index 9a881706ee2400f589156a008a447fa53f9f1cd3..af64dae5a64ca8a56eb8a4762f0f2826f6eac151 100644 (file)
--- a/ext/dba/tests/dba_cdb.phpt
+++ b/ext/dba/tests/dba_cdb.phpt
@@ -2,14 +2,14 @@
 DBA CDB handler test
 --SKIPIF--
 <?php 
+       $handler = 'cdb';
        require_once('skipif.inc');
-       if (!in_array('cdb', dba_handlers())) die('skip CDB handler not available');
        die('info CDB does not support replace or delete');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'cdb';
+       require_once('test.inc');
        require_once('dba_handler.inc');
 ?>
 --EXPECT--

diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt
index 40a417860c26e21531e2b2ae333d576e49decb1b..77f764dbe08c1baaede432ba800786e66b069a70 100644 (file)
--- a/ext/dba/tests/dba_cdb_make.phpt
+++ b/ext/dba/tests/dba_cdb_make.phpt
@@ -4,13 +4,14 @@ DBA CDB_MAKE handler test
 magic_quotes_runtime=1
 --SKIPIF--
 <?php 
+       $handler = 'cdb_make';
        require_once('skipif.inc');
-       if (!in_array('cdb_make', dba_handlers())) die('skip CDB_MAKE handler not available');
+       die('info CDB_MAKE does not support reading');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'cdb_make';
+       require_once('test.inc');
        echo "database handler: $handler\n";
        // print md5 checksum of test.cdb which is generated by cdb_make program
        var_dump(md5(implode('',file(dirname(__FILE__).'/test.cdb'))));

diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt
index 573a58cee3ea7207e2d372e6bb112f96e35a89b3..a0fbe7bccaee272c6503759ec725a58d0eeaf11e 100644 (file)
--- a/ext/dba/tests/dba_cdb_read.phpt
+++ b/ext/dba/tests/dba_cdb_read.phpt
@@ -2,8 +2,8 @@
 DBA CDB handler test (read only)
 --SKIPIF--
 <?php 
-       if (!extension_loaded('dba')) die('skip dba extension not available');
-       if (!in_array('cdb', dba_handlers())) die('skip CDB handler not available');
+       $handler = 'cdb_make';
+       require_once('skipif.inc');
 ?>
 --FILE--
 <?php

diff --git a/ext/dba/tests/dba_db2.phpt b/ext/dba/tests/dba_db2.phpt
index 154ea32111150ebc891cda8c46c62e27693e3da7..2e93b785d390f3f53f5d5270719ac092a7e78676 100644 (file)
--- a/ext/dba/tests/dba_db2.phpt
+++ b/ext/dba/tests/dba_db2.phpt
@@ -2,13 +2,13 @@
 DBA DB2 handler test
 --SKIPIF--
 <?php 
+       $handler = 'db2';
        require_once('skipif.inc');
-       if (!in_array('db2', dba_handlers())) die('skip DB2 handler not available');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'db2';
+       require_once('test.inc');
        require_once('dba_handler.inc');
 ?>
 --EXPECT--

diff --git a/ext/dba/tests/dba_db3.phpt b/ext/dba/tests/dba_db3.phpt
index e63b2da3e1e159f34a22c090bc74dbff3ab3b6d6..aa389d5f267e99b014cc834f16410bc6ac1efa87 100644 (file)
--- a/ext/dba/tests/dba_db3.phpt
+++ b/ext/dba/tests/dba_db3.phpt
@@ -2,13 +2,13 @@
 DBA DB3 handler test
 --SKIPIF--
 <?php 
+       $handler = 'db3';
        require_once('skipif.inc');
-       if (!in_array('db3', dba_handlers())) die('skip DB3 handler not available');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'db3';
+       require_once('test.inc');
        require_once('dba_handler.inc');
 ?>
 --EXPECT--

diff --git a/ext/dba/tests/dba_db4.phpt b/ext/dba/tests/dba_db4.phpt
index 1f94e0d3acf563833ebe884a7e1e6c62904a1377..fc5b3171f8f221bd5083ebbb4638e9705c176f93 100644 (file)
--- a/ext/dba/tests/dba_db4.phpt
+++ b/ext/dba/tests/dba_db4.phpt
@@ -2,13 +2,13 @@
 DBA DB4 handler test
 --SKIPIF--
 <?php 
+       $handler = 'db4';
        require_once('skipif.inc');
-       if (!in_array('db4', dba_handlers())) die('skip DB4 handler not available');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'db4';
+       require_once('test.inc');
        require_once('dba_handler.inc');
 ?>
 --EXPECT--

diff --git a/ext/dba/tests/dba_dbm.phpt b/ext/dba/tests/dba_dbm.phpt
index 937d31d0d86be24d7c981905667c278ed92a7ad0..e751cf60cf3254f899f13aab280521e1ea5afafa 100644 (file)
--- a/ext/dba/tests/dba_dbm.phpt
+++ b/ext/dba/tests/dba_dbm.phpt
@@ -2,13 +2,13 @@
 DBA DBM handler test
 --SKIPIF--
 <?php 
+       $handler = 'dbm';
        require_once('skipif.inc');
-       if (!in_array('dbm', dba_handlers())) die('skip DBM handler not available');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'dbm';
+       require_once('test.inc');
        require_once('dba_handler.inc');
 ?>
 --EXPECT--

diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt
index 42477dfd3c24ac4740a7473fdedf2ea90e95044b..8e259cb965a89f2aca4b53aa8331f2824ca4aaf3 100644 (file)
--- a/ext/dba/tests/dba_flatfile.phpt
+++ b/ext/dba/tests/dba_flatfile.phpt
@@ -2,13 +2,13 @@
 DBA FlatFile handler test
 --SKIPIF--
 <?php 
+       $handler = 'flatfile';
        require_once('skipif.inc');
-       if (!in_array('flatfile', dba_handlers())) die('skip FlatFile handler not available');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'flatfile';
+       require_once('test.inc');
        require_once('dba_handler.inc');
 ?>
 --EXPECT--

diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt
index c7eb5f9978504dc91d447ee46c5252ab234b0afb..b5d3c19ccd6bae491b6fd6497e5905efb4bff09b 100644 (file)
--- a/ext/dba/tests/dba_gdbm.phpt
+++ b/ext/dba/tests/dba_gdbm.phpt
@@ -2,13 +2,13 @@
 DBA GDBM handler test
 --SKIPIF--
 <?php 
+       $handler = 'gdbm';
        require_once('skipif.inc');
-       if (!in_array('gdbm', dba_handlers())) die('skip GDBM handler not available');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'gdbm';
+       require_once('test.inc');
        $lock_flag = ''; // lock in library
        require_once('dba_handler.inc');
        

diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt
index 5ccccbe238dcb8ee24fc8618a63a8fe304800503..11ca19e3b659a58db1a628439a8215f6a65bd80c 100644 (file)
--- a/ext/dba/tests/dba_inifile.phpt
+++ b/ext/dba/tests/dba_inifile.phpt
@@ -2,13 +2,13 @@
 DBA INIFILE handler test
 --SKIPIF--
 <?php 
+       $handler = 'inifile';
        require_once('skipif.inc');
-       if (!in_array('inifile', dba_handlers())) die('skip INIFILE handler not available');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'inifile';
+       require_once('test.inc');
        require_once('dba_handler.inc');
 ?>
 --EXPECT--

diff --git a/ext/dba/tests/dba_ndbm.phpt b/ext/dba/tests/dba_ndbm.phpt
index fd37b7bad2acf4a42643afbb0d987132c6eb1549..537f025564aa31350aff96b5588da65fe2a7a1fc 100644 (file)
--- a/ext/dba/tests/dba_ndbm.phpt
+++ b/ext/dba/tests/dba_ndbm.phpt
@@ -2,13 +2,13 @@
 DBA NDBM handler test
 --SKIPIF--
 <?php 
+       $handler = 'ndbm';
        require_once('skipif.inc');
-       if (!in_array('ndbm', dba_handlers())) die('skip NDBM handler not available');
 ?>
 --FILE--
 <?php
-       require_once('test.inc');
        $handler = 'ndbm';
+       require_once('test.inc');
        require_once('dba_handler.inc');
 ?>
 --EXPECT--

diff --git a/ext/dba/tests/skipif.inc b/ext/dba/tests/skipif.inc
index 141c907111108a2c2da4162c9a9f4d4ccbe83441..2fc81ca77369d94d7783b8c07fbfa0d387852c68 100644 (file)
--- a/ext/dba/tests/skipif.inc
+++ b/ext/dba/tests/skipif.inc
@@ -2,19 +2,24 @@
        if (!extension_loaded('dba')) die('skip dba extension not available');
        if (!function_exists('dba_handlers')) die ('skip dba_handlers() not available');
        if (!sizeof(dba_handlers())) die('skip no handlers installed');
-       $handler = dba_handlers(); 
-       if (in_array('flatfile', $handler)) {
-               $handler = 'flatfile';
-       } elseif ($handler[0]=='cdb') { // CDB currently supports only reading 
-               if (count($handler)==1) {
-                       die('skip CDB currently supports only reading');
+       if (!isset($handler)) {
+               $handlers = dba_handlers();
+               $handler  = false;
+               $acceptable = array('flatfile','db4','db3','db2','gdbm','ndbm','dbm','inifile');
+               foreach($acceptable as $hnd) {
+                       if (in_array($hnd, $handlers)) {
+                               $handler = $hnd;
+                               break;
+                       }
                }
-               if ($handler[1]=='cdb_make' && count($handler)==2) {
-                       die('skip CDB currently supports only reading and creating');
+               if ($handler === false) {
+                       die('skip No acceptable handler found');
                }
-               $handler = $handler[1];
        } else {
-               $handler = $handler[0];
+               if (!in_array($handler, dba_handlers())) {
+                       $HND = strtoupper($handler);
+                       die("skip $HND handler not available");
+               }
        }
        $HND = strtoupper($handler);
 ?>

diff --git a/ext/dba/tests/test.inc b/ext/dba/tests/test.inc
index 402096dbe961d5dbae08c1ecce5b1d5435c6646f..04f954541c553073d7bbf5b66c3bd43e9c0dde46 100644 (file)
--- a/ext/dba/tests/test.inc
+++ b/ext/dba/tests/test.inc
@@ -1,17 +1,7 @@
 <?php
-       $db_filename = $db_file = dirname(__FILE__).'/test0.dbm';
-       $handler = dba_handlers(); 
-       if (in_array('flatfile', $handler)) {
-               $handler = 'flatfile';
-       } elseif ($handler[0]=='cdb') { // CDB currently supports only reading 
-               if (count($handler)==1) {
-                       die('CDB currently supports only reading ');
-               }
-               $handler = $handler[1];
-       } else {
-               $handler = $handler[0];
-       }
+       require_once('skipif.inc');
        $lock_flag = 'l';
+       $db_filename = $db_file = dirname(__FILE__).'/test0.dbm';
        @unlink($db_filename);
        @unlink($db_filename.'.lck');
 ?>