From 6ea281f1d97dafd6467a2eea6f31d2e9c9ac7884 Mon Sep 17 00:00:00 2001 From: zYne Date: Sun, 10 Jun 2007 19:17:26 +0000 Subject: [PATCH] fixed E_STRICT issues --- lib/Doctrine/Adapter/Mock.php | 2 ++ lib/Doctrine/Export/Oracle.php | 2 +- lib/Doctrine/Expression/Mssql.php | 2 +- lib/Doctrine/Import/Firebird.php | 6 +++--- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/Doctrine/Adapter/Mock.php b/lib/Doctrine/Adapter/Mock.php index b1c8becf5..3d8dc3cc7 100644 --- a/lib/Doctrine/Adapter/Mock.php +++ b/lib/Doctrine/Adapter/Mock.php @@ -157,4 +157,6 @@ class Doctrine_Adapter_Mock implements Doctrine_Adapter_Interface, Countable { } + public function sqliteCreateFunction() + { } } diff --git a/lib/Doctrine/Export/Oracle.php b/lib/Doctrine/Export/Oracle.php index c5498703b..67e988e04 100644 --- a/lib/Doctrine/Export/Oracle.php +++ b/lib/Doctrine/Export/Oracle.php @@ -203,7 +203,7 @@ END; * * @return void */ - public function createTable($name, $fields, $options = array()) + public function createTable($name, array $fields, array $options = array()) { $this->conn->beginTransaction(); diff --git a/lib/Doctrine/Expression/Mssql.php b/lib/Doctrine/Expression/Mssql.php index 551388c7f..d0da43a43 100644 --- a/lib/Doctrine/Expression/Mssql.php +++ b/lib/Doctrine/Expression/Mssql.php @@ -72,7 +72,7 @@ class Doctrine_Expression_Mssql extends Doctrine_Expression * @param string $values... * @return string to concatenate two strings */ - public function concat($arg1, $arg2) + public function concat() { $args = func_get_args(); return '(' . implode(' + ', $args) . ')'; diff --git a/lib/Doctrine/Import/Firebird.php b/lib/Doctrine/Import/Firebird.php index 33266888c..dc7948b3f 100644 --- a/lib/Doctrine/Import/Firebird.php +++ b/lib/Doctrine/Import/Firebird.php @@ -37,7 +37,7 @@ class Doctrine_Import_Firebird extends Doctrine_Import * * @return array data array */ - public function listTables() + public function listTables($database = null) { $query = 'SELECT RDB$RELATION_NAME FROM RDB$RELATIONS WHERE RDB$SYSTEM_FLAG=0 AND RDB$VIEW_BLR IS NULL'; @@ -71,7 +71,7 @@ class Doctrine_Import_Firebird extends Doctrine_Import * * @return array data array containing all database views */ - public function listViews() + public function listViews($database = null) { return $this->conn->fetchColumn('SELECT DISTINCT RDB$VIEW_NAME FROM RDB$VIEW_RELATIONS'); } @@ -108,7 +108,7 @@ class Doctrine_Import_Firebird extends Doctrine_Import * previous database to query against. * @return array data array containing all triggers for given table */ - public function listTableTriggers($table = null) + public function listTableTriggers($table) { $query = 'SELECT RDB$TRIGGER_NAME FROM RDB$TRIGGERS WHERE RDB$SYSTEM_FLAG IS NULL OR RDB$SYSTEM_FLAG = 0';