From 1238a5000a656692bb2d3bbc33558eaa76a4880b Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Sun, 10 Jun 2007 19:20:40 +0000
Subject: [PATCH] fixed some more E_STRICT issues

---
 lib/Doctrine/Export/Mssql.php      | 2 +-
 lib/Doctrine/Expression/Oracle.php | 5 ++---
 lib/Doctrine/Expression/Pgsql.php  | 5 ++---
 lib/Doctrine/Import/Mssql.php      | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/lib/Doctrine/Export/Mssql.php b/lib/Doctrine/Export/Mssql.php
index 9b014b098..557dcc4e4 100644
--- a/lib/Doctrine/Export/Mssql.php
+++ b/lib/Doctrine/Export/Mssql.php
@@ -150,7 +150,7 @@ class Doctrine_Export_Mssql extends Doctrine_Export
      *                             actually perform them otherwise.
      * @return void
      */
-    public function alterTable($name, $changes, $check)
+    public function alterTable($name, array $changes, $check)
     {
         foreach ($changes as $changeName => $change) {
             switch ($changeName) {
diff --git a/lib/Doctrine/Expression/Oracle.php b/lib/Doctrine/Expression/Oracle.php
index fefa620a8..081c1fb86 100644
--- a/lib/Doctrine/Expression/Oracle.php
+++ b/lib/Doctrine/Expression/Oracle.php
@@ -41,12 +41,11 @@ class Doctrine_Expression_Oracle extends Doctrine_Expression
      * @param string $arg1, $arg2 ... $argN     strings that will be concatinated.
      * @return string
      */
-    public function concat($arg1, $arg2)
+    public function concat()
     {
         $args = func_get_args();
 
-        $cols = $this->getIdentifiers( $args );
-        return join( ' || ' , $cols );
+        return join(' || ' , $args);
     }
     /**
      * return string to call a function to get a substring inside an SQL statement
diff --git a/lib/Doctrine/Expression/Pgsql.php b/lib/Doctrine/Expression/Pgsql.php
index fd8d01b2e..5957f424a 100644
--- a/lib/Doctrine/Expression/Pgsql.php
+++ b/lib/Doctrine/Expression/Pgsql.php
@@ -92,12 +92,11 @@ class Doctrine_Expression_Pgsql extends Doctrine_Expression
      * @param string|array(string) strings that will be concatinated.
      * @return string
      */
-    public function concat($arg1, $arg2)
+    public function concat()
     {
         $args = func_get_args();
-        $cols = $this->getIdentifiers($cols);
 
-        return join(' || ' , $cols);
+        return join(' || ' , $args);
     }
     /**
      * Returns the SQL string to return the current system date and time.
diff --git a/lib/Doctrine/Import/Mssql.php b/lib/Doctrine/Import/Mssql.php
index 3e14307c5..dcde30bc5 100644
--- a/lib/Doctrine/Import/Mssql.php
+++ b/lib/Doctrine/Import/Mssql.php
@@ -115,7 +115,7 @@ class Doctrine_Import_Mssql extends Doctrine_Import
      *
      * @return array
      */
-    public function listTriggers()
+    public function listTriggers($database = null)
     {
         $query = "SELECT name FROM sysobjects WHERE xtype = 'TR'";