summaryrefslogtreecommitdiff
path: root/ext/pdo/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ext/pdo/tests')
-rw-r--r--ext/pdo/tests/bug_36428.phpt2
-rw-r--r--ext/pdo/tests/bug_38394.phpt2
-rw-r--r--ext/pdo/tests/bug_39398.phpt2
-rw-r--r--ext/pdo/tests/bug_40285.phpt4
-rw-r--r--ext/pdo/tests/bug_44409.phpt10
-rw-r--r--ext/pdo/tests/bug_47769.phpt2
-rw-r--r--ext/pdo/tests/bug_50458.phpt2
-rw-r--r--ext/pdo/tests/pdo_009.phpt14
-rw-r--r--ext/pdo/tests/pdo_010.phpt14
-rw-r--r--ext/pdo/tests/pdo_011.phpt8
-rw-r--r--ext/pdo/tests/pdo_012.phpt4
-rw-r--r--ext/pdo/tests/pdo_013.phpt4
-rw-r--r--ext/pdo/tests/pdo_015.phpt4
-rw-r--r--ext/pdo/tests/pdo_016.phpt4
-rw-r--r--ext/pdo/tests/pdo_016a.phpt4
-rw-r--r--ext/pdo/tests/pdo_019.phpt8
-rw-r--r--ext/pdo/tests/pdo_020.phpt4
-rw-r--r--ext/pdo/tests/pdo_023.phpt10
-rw-r--r--ext/pdo/tests/pdo_026.phpt6
-rw-r--r--ext/pdo/tests/pdo_029.phpt12
-rw-r--r--ext/pdo/tests/pdo_030.phpt12
21 files changed, 66 insertions, 66 deletions
diff --git a/ext/pdo/tests/bug_36428.phpt b/ext/pdo/tests/bug_36428.phpt
index 703b9d4de0..d21f7071f8 100644
--- a/ext/pdo/tests/bug_36428.phpt
+++ b/ext/pdo/tests/bug_36428.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
diff --git a/ext/pdo/tests/bug_38394.phpt b/ext/pdo/tests/bug_38394.phpt
index d0dea337d1..e786bdbd15 100644
--- a/ext/pdo/tests/bug_38394.phpt
+++ b/ext/pdo/tests/bug_38394.phpt
@@ -11,7 +11,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
diff --git a/ext/pdo/tests/bug_39398.phpt b/ext/pdo/tests/bug_39398.phpt
index 633771a951..0ad46f4131 100644
--- a/ext/pdo/tests/bug_39398.phpt
+++ b/ext/pdo/tests/bug_39398.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
diff --git a/ext/pdo/tests/bug_40285.phpt b/ext/pdo/tests/bug_40285.phpt
index c0a5674389..213777a808 100644
--- a/ext/pdo/tests/bug_40285.phpt
+++ b/ext/pdo/tests/bug_40285.phpt
@@ -1,7 +1,7 @@
--TEST--
PDO Common: Bug #40285 (The prepare parser goes into an infinite loop on ': or ":)
--SKIPIF--
-<?php
+<?php
if (!extension_loaded('pdo')) die('skip');
$dir = getenv('REDIR_TEST_DIR');
if (false == $dir) die('skip no driver');
@@ -23,5 +23,5 @@ $s->execute();
echo "Done\n";
?>
---EXPECT--
+--EXPECT--
Done
diff --git a/ext/pdo/tests/bug_44409.phpt b/ext/pdo/tests/bug_44409.phpt
index fe24fdfb86..64d385b26c 100644
--- a/ext/pdo/tests/bug_44409.phpt
+++ b/ext/pdo/tests/bug_44409.phpt
@@ -19,16 +19,16 @@ $db->exec("INSERT INTO test (dat) VALUES ('Data from DB')");
class bug44409 implements Serializable
{
- public function __construct()
+ public function __construct()
{
- printf("Method called: %s()\n", __METHOD__);
- }
+ printf("Method called: %s()\n", __METHOD__);
+ }
public function serialize()
{
- return "any data from serizalize()";
+ return "any data from serizalize()";
}
-
+
public function unserialize($dat)
{
printf("Method called: %s(%s)\n", __METHOD__, var_export($dat, true));
diff --git a/ext/pdo/tests/bug_47769.phpt b/ext/pdo/tests/bug_47769.phpt
index f713effd5d..c0ac8350ce 100644
--- a/ext/pdo/tests/bug_47769.phpt
+++ b/ext/pdo/tests/bug_47769.phpt
@@ -16,7 +16,7 @@ class test extends PDO
private function isPrivate() {
echo "this is a private method.\n";
}
-
+
public function quote($str, $paramtype = NULL) {
$this->isProtected();
$this->isPrivate();
diff --git a/ext/pdo/tests/bug_50458.phpt b/ext/pdo/tests/bug_50458.phpt
index 431073753f..7dbfec3593 100644
--- a/ext/pdo/tests/bug_50458.phpt
+++ b/ext/pdo/tests/bug_50458.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
diff --git a/ext/pdo/tests/pdo_009.phpt b/ext/pdo/tests/pdo_009.phpt
index 0e21177477..509a7d44db 100644
--- a/ext/pdo/tests/pdo_009.phpt
+++ b/ext/pdo/tests/pdo_009.phpt
@@ -15,14 +15,14 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
$db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)');
-$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')');
-$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')');
-$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')');
+$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')');
+$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')');
+$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')');
$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, 0, \'A\')');
-$db->exec('INSERT INTO test VALUES(2, 1, \'B\')');
-$db->exec('INSERT INTO test VALUES(3, 2, \'C\')');
-$db->exec('INSERT INTO test VALUES(4, 3, \'D\')');
+$db->exec('INSERT INTO test VALUES(1, 0, \'A\')');
+$db->exec('INSERT INTO test VALUES(2, 1, \'B\')');
+$db->exec('INSERT INTO test VALUES(3, 2, \'C\')');
+$db->exec('INSERT INTO test VALUES(4, 3, \'D\')');
$stmt = $db->prepare('SELECT classtypes.name, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id');
diff --git a/ext/pdo/tests/pdo_010.phpt b/ext/pdo/tests/pdo_010.phpt
index 812b868eb0..e00f901abe 100644
--- a/ext/pdo/tests/pdo_010.phpt
+++ b/ext/pdo/tests/pdo_010.phpt
@@ -15,14 +15,14 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
$db->exec('CREATE TABLE classtypes(id int NOT NULL PRIMARY KEY, name VARCHAR(10) NOT NULL UNIQUE)');
-$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')');
-$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')');
-$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')');
+$db->exec('INSERT INTO classtypes VALUES(0, \'stdClass\')');
+$db->exec('INSERT INTO classtypes VALUES(1, \'Test1\')');
+$db->exec('INSERT INTO classtypes VALUES(2, \'Test2\')');
$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, classtype int, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, 0, \'A\', \'Group1\')');
-$db->exec('INSERT INTO test VALUES(2, 1, \'B\', \'Group1\')');
-$db->exec('INSERT INTO test VALUES(3, 2, \'C\', \'Group2\')');
-$db->exec('INSERT INTO test VALUES(4, 3, \'D\', \'Group2\')');
+$db->exec('INSERT INTO test VALUES(1, 0, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, 1, \'B\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(3, 2, \'C\', \'Group2\')');
+$db->exec('INSERT INTO test VALUES(4, 3, \'D\', \'Group2\')');
$stmt = $db->prepare('SELECT classtypes.name, test.grp AS grp, test.id AS id, test.val AS val FROM test LEFT JOIN classtypes ON test.classtype=classtypes.id');
diff --git a/ext/pdo/tests/pdo_011.phpt b/ext/pdo/tests/pdo_011.phpt
index 4a240426e1..ffeac5bd8d 100644
--- a/ext/pdo/tests/pdo_011.phpt
+++ b/ext/pdo/tests/pdo_011.phpt
@@ -15,10 +15,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
-$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group1\')');
-$db->exec('INSERT INTO test VALUES(3, \'C\', \'Group2\')');
-$db->exec('INSERT INTO test VALUES(4, \'D\', \'Group2\')');
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(3, \'C\', \'Group2\')');
+$db->exec('INSERT INTO test VALUES(4, \'D\', \'Group2\')');
class DerivedStatement extends PDOStatement
{
diff --git a/ext/pdo/tests/pdo_012.phpt b/ext/pdo/tests/pdo_012.phpt
index 471c397c0a..ac87a384b5 100644
--- a/ext/pdo/tests/pdo_012.phpt
+++ b/ext/pdo/tests/pdo_012.phpt
@@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
-$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')');
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')');
$SELECT = 'SELECT val, grp FROM test';
diff --git a/ext/pdo/tests/pdo_013.phpt b/ext/pdo/tests/pdo_013.phpt
index 009c7e2d65..f4dcea5a2a 100644
--- a/ext/pdo/tests/pdo_013.phpt
+++ b/ext/pdo/tests/pdo_013.phpt
@@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), grp VARCHAR(10))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
-$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')');
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'Group1\')');
+$db->exec('INSERT INTO test VALUES(2, \'B\', \'Group2\')');
$SELECT = 'SELECT val, grp FROM test';
diff --git a/ext/pdo/tests/pdo_015.phpt b/ext/pdo/tests/pdo_015.phpt
index aea292b97f..ac6a61f1fb 100644
--- a/ext/pdo/tests/pdo_015.phpt
+++ b/ext/pdo/tests/pdo_015.phpt
@@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
$db->exec('CREATE TABLE test(id int NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(20))');
-$db->exec('INSERT INTO test VALUES(1, \'A\', \'A2\')');
-$db->exec('INSERT INTO test VALUES(2, \'A\', \'B2\')');
+$db->exec('INSERT INTO test VALUES(1, \'A\', \'A2\')');
+$db->exec('INSERT INTO test VALUES(2, \'A\', \'B2\')');
$select1 = $db->prepare('SELECT id, val, val2 FROM test');
$select2 = $db->prepare('SELECT val, val2 FROM test');
diff --git a/ext/pdo/tests/pdo_016.phpt b/ext/pdo/tests/pdo_016.phpt
index 12c9517233..abbe93f0bf 100644
--- a/ext/pdo/tests/pdo_016.phpt
+++ b/ext/pdo/tests/pdo_016.phpt
@@ -47,10 +47,10 @@ while($stmt2->fetch(PDO::FETCH_BOUND)) {
echo "===ALONE===\n";
-$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp');
+$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp');
$stmt3->bindParam(':inp', $idx); /* by foreign name */
-$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt');
+$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt');
$stmt4->bindParam(':txt', $txt); /* using same name */
foreach($cont as $idx => $txt)
diff --git a/ext/pdo/tests/pdo_016a.phpt b/ext/pdo/tests/pdo_016a.phpt
index 72f4b4224f..4703981173 100644
--- a/ext/pdo/tests/pdo_016a.phpt
+++ b/ext/pdo/tests/pdo_016a.phpt
@@ -47,10 +47,10 @@ while($stmt2->fetch(PDO::FETCH_BOUND)) {
echo "===ALONE===\n";
-$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp');
+$stmt3 = $db->prepare('SELECT txt FROM test WHERE idx=:inp');
$stmt3->bindParam('inp', $idx); /* by foreign name */
-$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt');
+$stmt4 = $db->prepare('SELECT idx FROM test WHERE txt=:txt');
$stmt4->bindParam('txt', $txt); /* using same name */
foreach($cont as $idx => $txt)
diff --git a/ext/pdo/tests/pdo_019.phpt b/ext/pdo/tests/pdo_019.phpt
index f6d75bbd1a..eb3bb22c88 100644
--- a/ext/pdo/tests/pdo_019.phpt
+++ b/ext/pdo/tests/pdo_019.phpt
@@ -15,10 +15,10 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
$db->exec('CREATE TABLE test(idx int NOT NULL PRIMARY KEY, txt VARCHAR(20))');
-$db->exec('INSERT INTO test VALUES(0, \'String0\')');
-$db->exec('INSERT INTO test VALUES(1, \'String1\')');
-$db->exec('INSERT INTO test VALUES(2, \'String2\')');
-$db->exec('INSERT INTO test VALUES(3, \'String3\')');
+$db->exec('INSERT INTO test VALUES(0, \'String0\')');
+$db->exec('INSERT INTO test VALUES(1, \'String1\')');
+$db->exec('INSERT INTO test VALUES(2, \'String2\')');
+$db->exec('INSERT INTO test VALUES(3, \'String3\')');
var_dump($db->query('SELECT COUNT(*) FROM test')->fetchColumn());
diff --git a/ext/pdo/tests/pdo_020.phpt b/ext/pdo/tests/pdo_020.phpt
index dc7e4d1a79..9c35da6adf 100644
--- a/ext/pdo/tests/pdo_020.phpt
+++ b/ext/pdo/tests/pdo_020.phpt
@@ -15,8 +15,8 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$db = PDOTest::factory();
$db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10), val2 VARCHAR(16))');
-$db->exec("INSERT INTO test VALUES(1, 'A', 'A')");
-$db->exec("INSERT INTO test VALUES(2, 'B', 'B')");
+$db->exec("INSERT INTO test VALUES(1, 'A', 'A')");
+$db->exec("INSERT INTO test VALUES(2, 'B', 'B')");
$db->exec("INSERT INTO test VALUES(3, 'C', 'C')");
foreach (array('SELECT id, val FROM test', 'SELECT id, val, val2 FROM test', 'SELECT COUNT(*) FROM test') as $sql) {
diff --git a/ext/pdo/tests/pdo_023.phpt b/ext/pdo/tests/pdo_023.phpt
index 564bcf8c51..8b4df3293b 100644
--- a/ext/pdo/tests/pdo_023.phpt
+++ b/ext/pdo/tests/pdo_023.phpt
@@ -16,14 +16,14 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
class PDOStatementX extends PDOStatement
{
public $test1 = 1;
-
+
protected function __construct()
{
$this->test2 = 2;
$this->test2 = 22;
echo __METHOD__ . "()\n";
}
-
+
function __destruct()
{
echo __METHOD__ . "()\n";
@@ -33,12 +33,12 @@ class PDOStatementX extends PDOStatement
class PDODatabaseX extends PDO
{
public $test1 = 1;
-
+
function __destruct()
{
echo __METHOD__ . "()\n";
}
-
+
function test()
{
$this->test2 = 2;
@@ -46,7 +46,7 @@ class PDODatabaseX extends PDO
var_dump($this->test2);
$this->test2 = 22;
}
-
+
function query($sql)
{
echo __METHOD__ . "()\n";
diff --git a/ext/pdo/tests/pdo_026.phpt b/ext/pdo/tests/pdo_026.phpt
index d993f32445..78121c926a 100644
--- a/ext/pdo/tests/pdo_026.phpt
+++ b/ext/pdo/tests/pdo_026.phpt
@@ -22,13 +22,13 @@ $data = array(
class PDOStatementX extends PDOStatement
{
public $dbh;
-
+
protected function __construct($dbh)
{
$this->dbh = $dbh;
echo __METHOD__ . "()\n";
}
-
+
function __destruct()
{
echo __METHOD__ . "()\n";
@@ -41,7 +41,7 @@ class PDODatabase extends PDO
{
echo __METHOD__ . "()\n";
}
-
+
function query($sql)
{
echo __METHOD__ . "()\n";
diff --git a/ext/pdo/tests/pdo_029.phpt b/ext/pdo/tests/pdo_029.phpt
index f3dc1f2fa4..8e495de3bd 100644
--- a/ext/pdo/tests/pdo_029.phpt
+++ b/ext/pdo/tests/pdo_029.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$data = array(
@@ -22,22 +22,22 @@ $data = array(
class PDOStatementX extends PDOStatement
{
public $dbh;
-
+
protected function __construct($dbh)
{
$this->dbh = $dbh;
echo __METHOD__ . "()\n";
}
-
+
function __destruct()
{
echo __METHOD__ . "()\n";
}
-
+
function execute($params = array())
{
echo __METHOD__ . "()\n";
- parent::execute();
+ parent::execute();
}
}
@@ -47,7 +47,7 @@ class PDODatabase extends PDO
{
echo __METHOD__ . "()\n";
}
-
+
function query($sql)
{
echo __METHOD__ . "()\n";
diff --git a/ext/pdo/tests/pdo_030.phpt b/ext/pdo/tests/pdo_030.phpt
index 243e94a1e7..a2a9207e77 100644
--- a/ext/pdo/tests/pdo_030.phpt
+++ b/ext/pdo/tests/pdo_030.phpt
@@ -10,7 +10,7 @@ PDOTest::skip();
?>
--FILE--
<?php
-if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
$data = array(
@@ -22,23 +22,23 @@ $data = array(
class PDOStatementX extends PDOStatement
{
public $dbh;
-
+
protected function __construct($dbh)
{
$this->dbh = $dbh;
$this->setFetchMode(PDO::FETCH_ASSOC);
echo __METHOD__ . "()\n";
}
-
+
function __destruct()
{
echo __METHOD__ . "()\n";
}
-
+
function execute($params = array())
{
echo __METHOD__ . "()\n";
- parent::execute();
+ parent::execute();
}
}
@@ -48,7 +48,7 @@ class PDODatabase extends PDO
{
echo __METHOD__ . "()\n";
}
-
+
function query($sql)
{
echo __METHOD__ . "()\n";