[PECL-CVS] [pecl-database-pdo_oci] main: ensure require_once is called in all tests instead of require()
[email protected] (Sharad Chandran R)
| Newsgroups | php.pecl.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: Sharad Chandran R (sharadraju)
Date: 2026-01-05T15:09:10+05:30
Commit: https://github.com/php/pecl-database-pdo_oci/commit/592787d9e7314a0ef8e3c255188f55eec652cbf8
Raw diff: https://github.com/php/pecl-database-pdo_oci/commit/592787d9e7314a0ef8e3c255188f55eec652cbf8.diff
ensure require_once is called in all tests instead of require()
Changed paths:
M tests/bug41996.phpt
M tests/bug44301.phpt
M tests/bug46274.phpt
M tests/bug46274_2.phpt
M tests/bug54379.phpt
M tests/bug57702.phpt
M tests/bug60994.phpt
M tests/bug_33707.phpt
M tests/checkliveness.phpt
M tests/common.phpt
M tests/oci_success_with_info.phpt
M tests/pdo_oci_attr_action.phpt
M tests/pdo_oci_attr_autocommit_1.phpt
M tests/pdo_oci_attr_autocommit_2.phpt
M tests/pdo_oci_attr_autocommit_3.phpt
M tests/pdo_oci_attr_call_timeout.phpt
M tests/pdo_oci_attr_case.phpt
M tests/pdo_oci_attr_client.phpt
M tests/pdo_oci_attr_client_identifier.phpt
M tests/pdo_oci_attr_client_info.phpt
M tests/pdo_oci_attr_drivername.phpt
M tests/pdo_oci_attr_module.phpt
M tests/pdo_oci_attr_nulls_1.phpt
M tests/pdo_oci_attr_prefetch_1.phpt
M tests/pdo_oci_attr_prefetch_2.phpt
M tests/pdo_oci_attr_server.phpt
M tests/pdo_oci_class_constants.phpt
M tests/pdo_oci_debugdumpparams.phpt
M tests/pdo_oci_fread_1.phpt
M tests/pdo_oci_phpinfo.phpt
M tests/pdo_oci_quote1.phpt
M tests/pdo_oci_stmt_getcolumnmeta.phpt
M tests/pdo_oci_stream_1.phpt
M tests/pdo_oci_stream_2.phpt
M tests/pdo_oci_templob_1.phpt
M tests/pecl_bug_11345.phpt
M tests/pecl_bug_6364.phpt
Diff:
diff --git a/tests/bug41996.phpt b/tests/bug41996.phpt
index 2039193..15e8959 100644
--- a/tests/bug41996.phpt
+++ b/tests/bug41996.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::test_factory(getenv('PDO_OCI_TEST_DIR').'/common.phpt');
$stmt = $db->prepare('SELECT rowid FROM dual');
@@ -20,3 +20,4 @@ var_dump(strlen($row[0]) > 0);
?>
--EXPECT--
bool(true)
+
diff --git a/tests/bug44301.phpt b/tests/bug44301.phpt
index ce9fe62..d19d223 100644
--- a/tests/bug44301.phpt
+++ b/tests/bug44301.phpt
@@ -26,3 +26,4 @@ $db = null;
--EXPECTF--
SQLSTATE[HY000]: General error: 942 OCIStmtExecute: ORA-00942: table or view %Sdoes not exist
(%soci_statement.c:%d)
+
diff --git a/tests/bug46274.phpt b/tests/bug46274.phpt
index 4ddb3ac..b10226a 100644
--- a/tests/bug46274.phpt
+++ b/tests/bug46274.phpt
@@ -9,7 +9,7 @@ require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::test_factory(getenv('PDO_OCI_TEST_DIR').'/common.phpt');
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -81,3 +81,4 @@ array(2) {
[0]=>
string(0) ""
}
+
diff --git a/tests/bug46274_2.phpt b/tests/bug46274_2.phpt
index 8aa28ef..48016ec 100644
--- a/tests/bug46274_2.phpt
+++ b/tests/bug46274_2.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::test_factory(getenv('PDO_OCI_TEST_DIR').'/common.phpt');
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -89,3 +89,4 @@ array(2) {
resource(%d) of type (stream)
}
string(0) ""
+
diff --git a/tests/bug54379.phpt b/tests/bug54379.phpt
index 4ccc170..45f34dc 100644
--- a/tests/bug54379.phpt
+++ b/tests/bug54379.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::test_factory(getenv('PDO_OCI_TEST_DIR').'/common.phpt');
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -54,3 +54,4 @@ array(2) {
string(60) "あいうえおかきくけこさしすせそたちつてと"
}
}
+
diff --git a/tests/bug57702.phpt b/tests/bug57702.phpt
index 6456e7a..b635a2c 100644
--- a/tests/bug57702.phpt
+++ b/tests/bug57702.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::test_factory(getenv('PDO_OCI_TEST_DIR').'/common.phpt');
// Note the PDO test setup sets PDO::ATTR_STRINGIFY_FETCHES to true
@@ -195,3 +195,4 @@ string(11) "row 1 col 2"
string(11) "row 2 col 1"
string(11) "row 2 col 2"
done
+
diff --git a/tests/bug60994.phpt b/tests/bug60994.phpt
index 0203992..d5f2cbe 100644
--- a/tests/bug60994.phpt
+++ b/tests/bug60994.phpt
@@ -14,7 +14,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
$dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
$dbh->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, false);
@@ -150,3 +150,4 @@ size of string4 is 24567 bytes, 8193 chars.
size of stream4 is 24567 bytes, 8193 chars.
beg of stream4 is abcののののののの
end of stream4 is のののののののxyz
+
diff --git a/tests/bug_33707.phpt b/tests/bug_33707.phpt
index 0836aa3..e4aa60e 100644
--- a/tests/bug_33707.phpt
+++ b/tests/bug_33707.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::test_factory(getenv('PDO_OCI_TEST_DIR').'/common.phpt');
$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
@@ -29,3 +29,4 @@ array(3) {
string(%d) "OCIStmtExecute: ORA-00942: table or view %Sdoes not exist
(%s:%d)"
}
+
diff --git a/tests/checkliveness.phpt b/tests/checkliveness.phpt
index dbf9193..c2244b1 100644
--- a/tests/checkliveness.phpt
+++ b/tests/checkliveness.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::test_factory(getenv('PDO_OCI_TEST_DIR').'/common.phpt');
$dsn = getenv('PDOTEST_DSN');
@@ -56,3 +56,4 @@ array(2) {
[0]=>
string(1) "X"
}
+
diff --git a/tests/common.phpt b/tests/common.phpt
index 45448f8..76b6b18 100644
--- a/tests/common.phpt
+++ b/tests/common.phpt
@@ -23,3 +23,4 @@ if (false !== getenv('PDO_OCI_TEST_DSN')) {
}
return $config;
+
diff --git a/tests/oci_success_with_info.phpt b/tests/oci_success_with_info.phpt
index 30a1cce..855a93e 100644
--- a/tests/oci_success_with_info.phpt
+++ b/tests/oci_success_with_info.phpt
@@ -15,7 +15,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
function connectAsAdmin(): PDO {
return PDOTest::test_factory(getenv('PDO_OCI_TEST_DIR').'/common.phpt');
}
@@ -121,3 +121,4 @@ array(3) {
string(%d) "OCIStmtExecute: OCI_SUCCESS_WITH_INFO: ORA-24344: %s
(%s:%d)"
}
+
diff --git a/tests/pdo_oci_attr_action.phpt b/tests/pdo_oci_attr_action.phpt
index 6b470f7..7af6fe1 100644
--- a/tests/pdo_oci_attr_action.phpt
+++ b/tests/pdo_oci_attr_action.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$query = 'select action from v$session where sid = sys_context(\'USERENV\', \'SID\')';
@@ -55,3 +55,4 @@ ACTION RESET: string(15) "something else!"
bool(true)
ACTION NULLED: NULL
Done
+
diff --git a/tests/pdo_oci_attr_autocommit_1.phpt b/tests/pdo_oci_attr_autocommit_1.phpt
index fd29948..9f1ab24 100644
--- a/tests/pdo_oci_attr_autocommit_1.phpt
+++ b/tests/pdo_oci_attr_autocommit_1.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
@@ -79,3 +79,4 @@ Insert data
Second connection should be able to see committed data
Data is: some data
Done
+
diff --git a/tests/pdo_oci_attr_autocommit_2.phpt b/tests/pdo_oci_attr_autocommit_2.phpt
index 6552f0d..43a83cf 100644
--- a/tests/pdo_oci_attr_autocommit_2.phpt
+++ b/tests/pdo_oci_attr_autocommit_2.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
@@ -144,3 +144,4 @@ data 4
data 5
data 6
Done
+
diff --git a/tests/pdo_oci_attr_autocommit_3.phpt b/tests/pdo_oci_attr_autocommit_3.phpt
index a1b7b94..6ec144f 100644
--- a/tests/pdo_oci_attr_autocommit_3.phpt
+++ b/tests/pdo_oci_attr_autocommit_3.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
// Check connection can be created with AUTOCOMMIT off
putenv('PDOTEST_ATTR='.serialize(array(PDO::ATTR_AUTOCOMMIT=>false)));
@@ -66,3 +66,4 @@ PDO::ATTR_AUTOCOMMIT: bool(false)
Insert data
Second connection should be able to see committed data
Done
+
diff --git a/tests/pdo_oci_attr_call_timeout.phpt b/tests/pdo_oci_attr_call_timeout.phpt
index f06aff6..700ea27 100644
--- a/tests/pdo_oci_attr_call_timeout.phpt
+++ b/tests/pdo_oci_attr_call_timeout.phpt
@@ -22,7 +22,7 @@ if (!(isset($matches[0]) && $matches[0] >= 18)) {
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
function mysleep($dbh, $t)
{
@@ -66,3 +66,4 @@ int(4000)
Execute error was OCIStmtExecute: ORA-%r(03136|03156)%r: %s
(%s:%d)
===DONE===
+
diff --git a/tests/pdo_oci_attr_case.phpt b/tests/pdo_oci_attr_case.phpt
index a1e33f1..e2c82f8 100644
--- a/tests/pdo_oci_attr_case.phpt
+++ b/tests/pdo_oci_attr_case.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
function do_query1($dbh)
{
@@ -81,3 +81,4 @@ array(1) {
string(1) "X"
}
Done
+
diff --git a/tests/pdo_oci_attr_client.phpt b/tests/pdo_oci_attr_client.phpt
index 91ce714..ba8608a 100644
--- a/tests/pdo_oci_attr_client.phpt
+++ b/tests/pdo_oci_attr_client.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
@@ -42,3 +42,4 @@ echo "Done\n";
ATTR_CLIENT_VERSION: string(%d) "%d.%s"
Version OK, so far as can be portably checked
Done
+
diff --git a/tests/pdo_oci_attr_client_identifier.phpt b/tests/pdo_oci_attr_client_identifier.phpt
index c81ad46..8b78fd1 100644
--- a/tests/pdo_oci_attr_client_identifier.phpt
+++ b/tests/pdo_oci_attr_client_identifier.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$query = 'select client_identifier from v$session where sid = sys_context(\'USERENV\', \'SID\')';
@@ -55,3 +55,4 @@ CLIENT_IDENTIFIER RESET: string(15) "something else!"
bool(true)
CLIENT_IDENTIFIER NULLED: NULL
Done
+
diff --git a/tests/pdo_oci_attr_client_info.phpt b/tests/pdo_oci_attr_client_info.phpt
index 42622fb..a6c5351 100644
--- a/tests/pdo_oci_attr_client_info.phpt
+++ b/tests/pdo_oci_attr_client_info.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$query = 'select client_info from v$session where sid = sys_context(\'USERENV\', \'SID\')';
@@ -55,3 +55,4 @@ CLIENT_INFO RESET: string(15) "something else!"
bool(true)
CLIENT_INFO NULLED: NULL
Done
+
diff --git a/tests/pdo_oci_attr_drivername.phpt b/tests/pdo_oci_attr_drivername.phpt
index 7d8a84c..da46c12 100644
--- a/tests/pdo_oci_attr_drivername.phpt
+++ b/tests/pdo_oci_attr_drivername.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
var_dump($dbh->getAttribute(PDO::ATTR_DRIVER_NAME));
@@ -21,3 +21,4 @@ echo "Done\n";
--EXPECT--
string(3) "oci"
Done
+
diff --git a/tests/pdo_oci_attr_module.phpt b/tests/pdo_oci_attr_module.phpt
index ad25d5f..de47416 100644
--- a/tests/pdo_oci_attr_module.phpt
+++ b/tests/pdo_oci_attr_module.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$query = 'select module from v$session where sid = sys_context(\'USERENV\', \'SID\')';
@@ -49,3 +49,4 @@ MODULE RESET: string(15) "something else!"
bool(true)
MODULE NULLED: NULL
Done
+
diff --git a/tests/pdo_oci_attr_nulls_1.phpt b/tests/pdo_oci_attr_nulls_1.phpt
index 8242f77..be1499c 100644
--- a/tests/pdo_oci_attr_nulls_1.phpt
+++ b/tests/pdo_oci_attr_nulls_1.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
function do_query($dbh)
{
@@ -61,3 +61,4 @@ PDO::ATTR_ORACLE_NULLS: PDO::NULL_TO_STRING: int(2)
string(0) ""
string(0) ""
Done
+
diff --git a/tests/pdo_oci_attr_prefetch_1.phpt b/tests/pdo_oci_attr_prefetch_1.phpt
index c90e47a..02e58cd 100644
--- a/tests/pdo_oci_attr_prefetch_1.phpt
+++ b/tests/pdo_oci_attr_prefetch_1.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
@@ -78,3 +78,4 @@ Test set PHP_INT_MAX: (Uses default)
100
X
Done
+
diff --git a/tests/pdo_oci_attr_prefetch_2.phpt b/tests/pdo_oci_attr_prefetch_2.phpt
index 4cbc6ab..6e80e13 100644
--- a/tests/pdo_oci_attr_prefetch_2.phpt
+++ b/tests/pdo_oci_attr_prefetch_2.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
@@ -47,3 +47,4 @@ X
Test 2: Turn off prefetching
X
Done
+
diff --git a/tests/pdo_oci_attr_server.phpt b/tests/pdo_oci_attr_server.phpt
index a44b38c..07c03b0 100644
--- a/tests/pdo_oci_attr_server.phpt
+++ b/tests/pdo_oci_attr_server.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
@@ -40,3 +40,4 @@ Test 2
ATTR_SERVER_INFO
Found 'Oracle' at position 0 as expected
Done
+
diff --git a/tests/pdo_oci_class_constants.phpt b/tests/pdo_oci_class_constants.phpt
index 96f9f22..7d38047 100644
--- a/tests/pdo_oci_class_constants.phpt
+++ b/tests/pdo_oci_class_constants.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$expected = [
'OCI_ATTR_CLIENT_INFO' => true,
@@ -66,3 +66,4 @@ print "done!";
?>
--EXPECT--
done!
+
diff --git a/tests/pdo_oci_debugdumpparams.phpt b/tests/pdo_oci_debugdumpparams.phpt
index 52d13ef..6162525 100644
--- a/tests/pdo_oci_debugdumpparams.phpt
+++ b/tests/pdo_oci_debugdumpparams.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::factory();
$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
@@ -37,3 +37,4 @@ SQL: [844]%s
Params: 0
NULL
+
diff --git a/tests/pdo_oci_fread_1.phpt b/tests/pdo_oci_fread_1.phpt
index 898a753..dd7c21a 100644
--- a/tests/pdo_oci_fread_1.phpt
+++ b/tests/pdo_oci_fread_1.phpt
@@ -12,7 +12,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
@@ -67,3 +67,4 @@ $db->exec("begin
--EXPECT--
Test 1
*abcjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj**jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj**jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj**jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjxyz*
+
diff --git a/tests/pdo_oci_phpinfo.phpt b/tests/pdo_oci_phpinfo.phpt
index 68b384f..83933a3 100644
--- a/tests/pdo_oci_phpinfo.phpt
+++ b/tests/pdo_oci_phpinfo.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::factory();
ob_start();
@@ -27,3 +27,4 @@ print "done!";
?>
--EXPECT--
done!
+
diff --git a/tests/pdo_oci_quote1.phpt b/tests/pdo_oci_quote1.phpt
index e2c2f7c..36f965e 100644
--- a/tests/pdo_oci_quote1.phpt
+++ b/tests/pdo_oci_quote1.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::factory();
$db->exec("begin
@@ -169,3 +169,4 @@ array(1) {
}
}
Done
+
diff --git a/tests/pdo_oci_stmt_getcolumnmeta.phpt b/tests/pdo_oci_stmt_getcolumnmeta.phpt
index 16384fe..a9e0dc3 100644
--- a/tests/pdo_oci_stmt_getcolumnmeta.phpt
+++ b/tests/pdo_oci_stmt_getcolumnmeta.phpt
@@ -325,3 +325,4 @@ Test 2.5 testing lobs columns
Test 2.6 testing function return
Test 2.7 testing flags returned
done!
+
diff --git a/tests/pdo_oci_stream_1.phpt b/tests/pdo_oci_stream_1.phpt
index 3fc09b5..37b7906 100644
--- a/tests/pdo_oci_stream_1.phpt
+++ b/tests/pdo_oci_stream_1.phpt
@@ -12,7 +12,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
@@ -119,3 +119,4 @@ Read 0
Read 0
Read 0
Read jjjxyz
+
diff --git a/tests/pdo_oci_stream_2.phpt b/tests/pdo_oci_stream_2.phpt
index 1493fee..dbe70b8 100644
--- a/tests/pdo_oci_stream_2.phpt
+++ b/tests/pdo_oci_stream_2.phpt
@@ -12,7 +12,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::factory();
@@ -133,3 +133,4 @@ $db->exec("begin
--EXPECT--
Inserting 1000 Records ... Done
Fetch operation done!
+
diff --git a/tests/pdo_oci_templob_1.phpt b/tests/pdo_oci_templob_1.phpt
index a1ec0f0..dfe9bae 100644
--- a/tests/pdo_oci_templob_1.phpt
+++ b/tests/pdo_oci_templob_1.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
--FILE--
<?PHP
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$db = PDOTest::test_factory(getenv('PDO_OCI_TEST_DIR').'/common.phpt');
$clobquery1 = "select TO_CLOB('Hello World') CLOB_DATA from dual";
@@ -84,3 +84,4 @@ else
?>
--EXPECT--
Success! All the temporary LOB in previously closed statements are properly cleaned.
+
diff --git a/tests/pecl_bug_11345.phpt b/tests/pecl_bug_11345.phpt
index 988c891..a008749 100644
--- a/tests/pecl_bug_11345.phpt
+++ b/tests/pecl_bug_11345.phpt
@@ -28,3 +28,4 @@ echo "Done\n";
?>
--EXPECTF--
Connection failed: SQLSTATE[HY000]: OCINlsCharSetNameToId: unknown character set name (%s)
+
diff --git a/tests/pecl_bug_6364.phpt b/tests/pecl_bug_6364.phpt
index 03b372a..cb9c987 100644
--- a/tests/pecl_bug_6364.phpt
+++ b/tests/pecl_bug_6364.phpt
@@ -12,7 +12,7 @@ PDOTest::skip();
--FILE--
<?php
-require(getenv('PDO_TEST_DIR').'/pdo_test.inc');
+require_once(getenv('PDO_TEST_DIR').'/pdo_test.inc');
$dbh = PDOTest::factory();
$dbh->exec("begin
@@ -85,3 +85,4 @@ array(10) {
NULL
}
Done
+