From 7e0d11f0689e7c0ffea261acb261580a7f9cf3c6 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Thu, 6 May 2010 11:48:59 +0200
Subject: [PATCH] Don't require a logger in Horde_Db_Migrator.

---
 framework/Alarm/test/Horde/Alarm/SqlTest.php     |  3 +--
 framework/Db/lib/Horde/Db/Migration/Migrator.php | 25 +++++++++++++-----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/framework/Alarm/test/Horde/Alarm/SqlTest.php b/framework/Alarm/test/Horde/Alarm/SqlTest.php
index ca493d5c4..dfe048c5d 100644
--- a/framework/Alarm/test/Horde/Alarm/SqlTest.php
+++ b/framework/Alarm/test/Horde/Alarm/SqlTest.php
@@ -42,8 +42,7 @@ class Horde_Alarm_SqlTest extends PHPUnit_Framework_TestCase
         $class = 'Horde_Db_Adapter_' . $adapter;
         self::$db = new $class($conf['alarm']['test']['horde']);
 
-        $logger = new Horde_Log_Logger(new Horde_Log_Handler_Null());
-        self::$migrator = new Horde_Db_Migration_Migrator(self::$db, $logger, array('migrationsPath' => dirname(dirname(dirname(dirname(__FILE__)))) . '/migrations'));
+        self::$migrator = new Horde_Db_Migration_Migrator(self::$db, null, array('migrationsPath' => dirname(dirname(dirname(dirname(__FILE__)))) . '/migrations'));
         self::$migrator->up();
     }
 
diff --git a/framework/Db/lib/Horde/Db/Migration/Migrator.php b/framework/Db/lib/Horde/Db/Migration/Migrator.php
index 6dc133965..3be67fa85 100644
--- a/framework/Db/lib/Horde/Db/Migration/Migrator.php
+++ b/framework/Db/lib/Horde/Db/Migration/Migrator.php
@@ -43,29 +43,32 @@ class Horde_Db_Migration_Migrator
      */
     protected $_schemaTableName = 'schema_info';
 
-
-    /*##########################################################################
-    # Constructor
-    ##########################################################################*/
-
     /**
+     * Constructor.
+     *
      * @param   string  $direction
      * @param   string  $migrationsPath
      * @param   integer $targetVersion
      */
-    public function __construct(Horde_Db_Adapter_Base $connection, Horde_Log_Logger $logger, $options = array())
+    public function __construct(Horde_Db_Adapter_Base $connection,
+                                Horde_Log_Logger $logger = null,
+                                array $options = array())
     {
         if (!$connection->supportsMigrations()) {
             $msg = 'This database does not yet support migrations';
             throw new Horde_Db_Migration_Exception($msg);
         }
 
-        $this->_connection     = $connection;
-        $this->_logger         = $logger;
-        $this->_inflector      = new Horde_Support_Inflector();
+        $this->_connection = $connection;
+        $this->_logger     = $logger ? $logger : new Horde_Support_Stub();
+        $this->_inflector  = new Horde_Support_Inflector();
 
-        if (isset($options['migrationsPath'])) { $this->_migrationsPath = $options['migrationsPath']; }
-        if (isset($options['schemaTableName'])) { $this->_schemaTableName = $options['schemaTableName']; }
+        if (isset($options['migrationsPath'])) {
+            $this->_migrationsPath = $options['migrationsPath'];
+        }
+        if (isset($options['schemaTableName'])) {
+            $this->_schemaTableName = $options['schemaTableName'];
+        }
 
         $this->_initializeSchemaInformation();
     }
-- 
2.11.0