Fixes

Author: kocsismate

ext/pdo_dblib/tests/bug_45876.phpt

@@ -6,6 +6,8 @@ pdo_dblib
 <?php
 require __DIR__ . '/config.inc';
 ?>
+--CONFLICTS--
+pdo_dblib
 --FILE--
 <?php
 require __DIR__ . '/config.inc';

ext/pdo_dblib/tests/bug_50755.phpt

@@ -7,6 +7,8 @@ pdo_dblib
 if (getenv('SKIP_REPEAT')) die('skip May fail on repeat');
 require __DIR__ . '/config.inc';
 ?>
+--CONFLICTS--
+pdo_dblib
 --FILE--
 <?php
 require __DIR__ . '/config.inc';

ext/pdo_firebird/tests/CONFLICTS

@@ -0,0 +1 @@
+firebird

ext/pdo_firebird/tests/bug_47415.phpt

@@ -40,6 +40,7 @@ unset($dbh);
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test47415");
+unset($dbh);
 ?>
 --EXPECT--
 bool(false)

ext/pdo_firebird/tests/bug_48877.phpt

@@ -41,6 +41,7 @@ unset($dbh);
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test48877");
+unset($dbh);
 ?>
 --EXPECT--
 bool(false)

ext/pdo_firebird/tests/bug_53280.phpt

@@ -39,6 +39,7 @@ unset($dbh);
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test53280");
+unset($dbh);
 ?>
 --EXPECT--
 array(1) {

ext/pdo_firebird/tests/bug_62024.phpt

@@ -47,6 +47,7 @@ unset($dbh);
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test62024");
+unset($dbh);
 ?>
 --EXPECT--
 bool(true)

ext/pdo_firebird/tests/bug_64037.phpt

@@ -41,6 +41,7 @@ unset($dbh);
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test64037");
+unset($dbh);
 ?>
 --EXPECT--
 string(5) "-1.00"

ext/pdo_firebird/tests/bug_72583.phpt

@@ -23,6 +23,7 @@ unset($dbh);
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test72583");
+unset($dbh);
 ?>
 --EXPECT--
 integer

ext/pdo_firebird/tests/bug_72931.phpt

@@ -22,6 +22,7 @@ unset($dbh);
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test72931");
+unset($dbh);
 ?>
 --EXPECT--
 1

ext/pdo_firebird/tests/bug_73087.phpt

@@ -29,6 +29,7 @@ echo 'OK';
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test73087");
+unset($dbh);
 ?>
 --EXPECT--
 OK

ext/pdo_firebird/tests/bug_74462.phpt

@@ -24,6 +24,7 @@ var_dump($D);
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test74462");
+unset($dbh);
 ?>
 --EXPECT--
 array(3) {

ext/pdo_firebird/tests/bug_80521.phpt

@@ -22,4 +22,5 @@ object(PDOStatement)#%d (1) {
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE bug80521");
+unset($dbh);
 ?>

ext/pdo_firebird/tests/bug_aaa.phpt

@@ -23,6 +23,7 @@ echo 'OK';
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE test_aaa");
+unset($dbh);
 ?>
 --EXPECT--
 OK

ext/pdo_firebird/tests/ddl.phpt

@@ -39,6 +39,7 @@ require("testdb.inc");
 @$dbh->exec('DROP TABLE test_ddl');
 @$dbh->exec('DROP GENERATOR gen_test_ddl_id');
 @$dbh->exec('DROP TRIGGER test_ddl_bi');
+unset($dbh);
 
 ?>
 --EXPECT--

ext/pdo_firebird/tests/dialect_1.phpt

@@ -56,6 +56,7 @@ echo "done\n";
 <?php
 require 'testdb.inc';
 @$dbh->exec('DROP TABLE test_dialect_1');
+unset($dbh);
 --EXPECT--
 int(1)
 string(8) "2.000000"

ext/pdo_firebird/tests/execute.phpt

@@ -47,6 +47,7 @@ echo "done\n";
 <?php
 require 'testdb.inc';
 @$dbh->exec('DROP TABLE test_execute');
+unset($dbh);
 --EXPECT--
 bool(true)
 int(1)

ext/pdo_firebird/tests/gh10908.phpt

@@ -57,6 +57,7 @@ echo "Did not crash\n";
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE gh10908");
+unset($dbh);
 ?>
 --EXPECT--
 Array

ext/pdo_firebird/tests/gh8576.phpt

@@ -27,4 +27,5 @@ array(1) {
 <?php
 require 'testdb.inc';
 @$dbh->exec("DROP TABLE gh8576");
+unset($dbh);
 ?>

ext/pdo_firebird/tests/rowCount.phpt

@@ -45,6 +45,7 @@ unset($dbh);
 <?php
 require 'testdb.inc';
 @$dbh->exec('DROP TABLE test_rowcount');
+unset($dbh);
 --EXPECT--
 bool(false)
 int(2)