From: Marcus Boerger <helly@php.net>
Date: Fri, 15 Nov 2002 16:39:36 +0000 (+0000)
Subject: MFH: info about handler used and use flatfile if available
X-Git-Tag: php-4.3.0RC2~137
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=608a52b9b9374c479eb890f7898802e069864ee2;p=php

MFH: info about handler used and use flatfile if available
---

diff --git a/ext/dba/tests/dba001.phpt b/ext/dba/tests/dba001.phpt
index 68d3373376..3d617fb2c2 100644
--- a/ext/dba/tests/dba001.phpt
+++ b/ext/dba/tests/dba001.phpt
@@ -3,6 +3,7 @@ DBA File Creation Test
 --SKIPIF--
 <?php 
 	require_once('skipif.inc');
+	die("info $HND handler used");
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba002.phpt b/ext/dba/tests/dba002.phpt
index d4e4eb1710..3f862e38c5 100644
--- a/ext/dba/tests/dba002.phpt
+++ b/ext/dba/tests/dba002.phpt
@@ -3,6 +3,7 @@ DBA Insert/Fetch Test
 --SKIPIF--
 <?php 
 	require_once('skipif.inc');
+	die("info $HND handler used");
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba003.phpt b/ext/dba/tests/dba003.phpt
index 5fdc622c1b..617ae91891 100644
--- a/ext/dba/tests/dba003.phpt
+++ b/ext/dba/tests/dba003.phpt
@@ -3,6 +3,7 @@ DBA Insert/Replace/Fetch Test
 --SKIPIF--
 <?php 
 	require_once('skipif.inc');
+	die("info $HND handler used");
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba004.phpt b/ext/dba/tests/dba004.phpt
index 5403ae0033..3b1f29c7dd 100644
--- a/ext/dba/tests/dba004.phpt
+++ b/ext/dba/tests/dba004.phpt
@@ -3,6 +3,7 @@ DBA Multiple Insert/Fetch Test
 --SKIPIF--
 <?php 
 	require_once('skipif.inc');
+	die("info $HND handler used");
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba005.phpt b/ext/dba/tests/dba005.phpt
index d2b958ca61..5a933c48f9 100644
--- a/ext/dba/tests/dba005.phpt
+++ b/ext/dba/tests/dba005.phpt
@@ -3,6 +3,7 @@ DBA FirstKey/NextKey Loop Test With 5 Items
 --SKIPIF--
 <?php 
 	require_once('skipif.inc');
+	die("info $HND handler used");
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba006.phpt b/ext/dba/tests/dba006.phpt
index a572a70f3b..efa36a5d07 100644
--- a/ext/dba/tests/dba006.phpt
+++ b/ext/dba/tests/dba006.phpt
@@ -3,6 +3,7 @@ DBA FirstKey/NextKey with 2 deletes
 --SKIPIF--
 <?php 
 	require_once('skipif.inc');
+	die("info $HND handler used");
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt
index 65509bc240..0add3809aa 100644
--- a/ext/dba/tests/dba007.phpt
+++ b/ext/dba/tests/dba007.phpt
@@ -4,6 +4,7 @@ DBA Multiple File Creation Test
 <?php 
 	require_once('skipif.inc');
 	if (!function_exists('dba_list')) die('skip dba_list() not available');
+	die("info $HND handler used");
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/dba008.phpt b/ext/dba/tests/dba008.phpt
index a8bcafe809..340131c30b 100644
--- a/ext/dba/tests/dba008.phpt
+++ b/ext/dba/tests/dba008.phpt
@@ -3,6 +3,7 @@ DBA magic_quotes_runtime Test
 --SKIPIF--
 <?php 
 	require_once('skipif.inc');
+	die("info $HND handler used");
 ?>
 --FILE--
 <?php
diff --git a/ext/dba/tests/skipif.inc b/ext/dba/tests/skipif.inc
index f4855b708b..141c907111 100644
--- a/ext/dba/tests/skipif.inc
+++ b/ext/dba/tests/skipif.inc
@@ -2,14 +2,19 @@
 	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');
-	// CDB currently supports only reading 
 	$handler = dba_handlers(); 
-	if ($handler[0]=='cdb') {
+	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 ($handler[1]=='cdb_make' && count($handler)==2) {
 			die('skip CDB currently supports only reading and creating');
 		}
+		$handler = $handler[1];
+	} else {
+		$handler = $handler[0];
 	}
+	$HND = strtoupper($handler);
 ?>
diff --git a/ext/dba/tests/test.inc b/ext/dba/tests/test.inc
index e280226f68..402096dbe9 100644
--- a/ext/dba/tests/test.inc
+++ b/ext/dba/tests/test.inc
@@ -1,8 +1,9 @@
 <?php
 	$db_filename = $db_file = dirname(__FILE__).'/test0.dbm';
 	$handler = dba_handlers(); 
-	// CDB currently supports only reading 
-	if ($handler[0]=='cdb') {
+	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 ');
 		}