From: Christopher Jones <sixd@php.net>
Date: Wed, 12 Aug 2009 14:54:16 +0000 (+0000)
Subject: refactor & WS for local test config change
X-Git-Tag: php-5.4.0alpha1~191^2~2804
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0645f936221fa0a9569562c24c07a65817399ab9;p=php

refactor & WS for local test config change
---

diff --git a/ext/oci8/tests/connect.inc b/ext/oci8/tests/connect.inc
index 8fb0a7f07e..151ccf22c4 100644
--- a/ext/oci8/tests/connect.inc
+++ b/ext/oci8/tests/connect.inc
@@ -1,10 +1,6 @@
 <?php
 
-if (file_exists("details_local.inc")) {
-	include("details_local.inc"); // this file is not part of the source distribution; make it your own local variant of details.inc
-} else {
-	include "details.inc";
-}
+require("details.inc");
 
 if (!empty($dbase)) {
 	$c = @oci_connect($user, $password, $dbase);
diff --git a/ext/oci8/tests/details.inc b/ext/oci8/tests/details.inc
index 0c53823eec..75a136ce34 100644
--- a/ext/oci8/tests/details.inc
+++ b/ext/oci8/tests/details.inc
@@ -14,36 +14,40 @@
  * string like hostname:port/service_name:POOLED
  */
 
-if (false !== getenv('PHP_OCI8_TEST_DB')) {
-	$user		= getenv('PHP_OCI8_TEST_USER');	  // Database username for tests
-	$password	= getenv('PHP_OCI8_TEST_PASS');	  // Password for $user
-	$dbase		= getenv('PHP_OCI8_TEST_DB');     // Database connection string
-	$test_drcp	= getenv('PHP_OCI8_TEST_DRCP');
-	if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) {
-		$test_drcp = TRUE;
-	} else {
-		$test_drcp = FALSE;
-	}
-	$oracle_on_localhost = getenv('PHP_OCI8_TEST_DB_ON_LOCALHOST');
-	if (false !== $oracle_on_localhost && 0 == strcasecmp($oracle_on_localhost,'TRUE')) {
-		$oracle_on_localhost = TRUE;
-	} else {
-		$oracle_on_localhost = FALSE;
-	}
+if (file_exists(dirname(__FILE__)."/details_local.inc")) {
+    include(dirname(__FILE__)."/details_local.inc");   // this file is not part of the source distribution; make it your own local variant of details.inc
 } else {
-	$user						= "system";
-	$password					= "oracle";
-	$dbase						= "localhost/XE";
-	$oracle_on_localhost		= TRUE;
-	$test_drcp					= FALSE;
+    if (false !== getenv('PHP_OCI8_TEST_DB')) {
+        $user		= getenv('PHP_OCI8_TEST_USER');	  // Database username for tests
+        $password	= getenv('PHP_OCI8_TEST_PASS');	  // Password for $user
+        $dbase		= getenv('PHP_OCI8_TEST_DB');     // Database connection string
+        $test_drcp	= getenv('PHP_OCI8_TEST_DRCP');
+        if (false !== $test_drcp && 0 == strcasecmp($test_drcp,'TRUE')) {
+            $test_drcp = TRUE;
+        } else {
+            $test_drcp = FALSE;
+        }
+        $oracle_on_localhost = getenv('PHP_OCI8_TEST_DB_ON_LOCALHOST');
+        if (false !== $oracle_on_localhost && 0 == strcasecmp($oracle_on_localhost,'TRUE')) {
+            $oracle_on_localhost = TRUE;
+        } else {
+            $oracle_on_localhost = FALSE;
+        }
+    } else {
+        $user						= "system";
+        $password					= "oracle";
+        $dbase						= "localhost/XE";
+        $oracle_on_localhost		= TRUE;
+        $test_drcp					= FALSE;
+    }
+    
+    /*
+     * Common object names for scripts to use
+     */
+    
+    $table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5);
+    $type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5));
+    $schema = '';
 }
 
-/*
- * Common object names for scripts to use
- */
-
-$table_name = "tb".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5);
-$type_name = strtoupper("tp".substr(str_replace(Array(".", "-"), "_", php_uname("n")), 0, 5));
-$schema = '';
-
 ?>