Rebuild factory for Horde_Notification

Still need to so something different with the singleton method I think.  Does it really belong in the class?

diff --git a/framework/Core/lib/Horde/Core/Binder/Notification.php b/framework/Core/lib/Horde/Core/Binder/Notification.php
deleted file mode 100644 (file)
index 1608431..0000000
--- a/framework/Core/lib/Horde/Core/Binder/Notification.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Notification implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        $notify = Horde_Notification::singleton();
-
-        $notify->addType('default', '*', 'Horde_Core_Notification_Status');
-        $notify->addType('status', 'horde.*', 'Horde_Core_Notification_Status');
-
-        $notify->addDecorator(new Horde_Notification_Handler_Decorator_Alarm($injector->getInstance('Horde_Alarm'), $GLOBALS['registry']->getAuth()));
-        $notify->addDecorator(new Horde_Core_Notification_Hordelog());
-
-        return $notify;
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-
-}

diff --git a/framework/Core/lib/Horde/Core/Factory/Notification.php b/framework/Core/lib/Horde/Core/Factory/Notification.php
new file mode 100644 (file)
index 0000000..1295f6c
--- /dev/null
+++ b/framework/Core/lib/Horde/Core/Factory/Notification.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * @category Horde
+ * @package  Core
+ */
+class Horde_Core_Factory_Notification
+{
+    public function create(Horde_Injector $injector)
+    {
+        $notify = Horde_Notification::singleton();
+
+        $notify->addType('default', '*', 'Horde_Core_Notification_Status');
+        $notify->addType('status', 'horde.*', 'Horde_Core_Notification_Status');
+
+        $notify->addDecorator(new Horde_Notification_Handler_Decorator_Alarm($injector->getInstance('Horde_Alarm'), $GLOBALS['registry']->getAuth()));
+        $notify->addDecorator(new Horde_Core_Notification_Hordelog());
+
+        return $notify;
+    }
+}

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 2a010cf..baa334f 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -277,7 +277,6 @@ class Horde_Registry
             'Horde_LoginTasks' => new Horde_Core_Binder_LoginTasks(),
             'Horde_Mail' => new Horde_Core_Binder_Mail(),
             'Horde_Mime_Viewer' => new Horde_Core_Binder_MimeViewer(),
-            'Horde_Notification' => new Horde_Core_Binder_Notification(),
             'Horde_Prefs_Identity' => new Horde_Core_Binder_Identity(),
             'Horde_Share_Factory' => new Horde_Core_Binder_ShareFactory(),
             'Horde_Template' => new Horde_Core_Binder_Template(),
@@ -333,6 +332,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Memcache',
                 'create',
             ),
+            'Horde_Notification' => array(
+                'Horde_Core_Factory_Notification',
+                'create',
+            ),
             'Horde_Perms' => array(
                 'Horde_Core_Factory_Perms',
                 'create',

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 35fd321..eb54fc9 100644 (file)
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -23,8 +23,8 @@ Application Framework.</description>
   <email>slusarz@horde.org</email>
   <active>yes</active>
  </developer>
- <date>2010-10-03</date>
- <time>14:23:47</time>
+ <date>2010-10-04</date>
+ <time>14:21:49</time>
  <version>
   <release>0.1.0</release>
   <api>0.1.0</api>
@@ -127,7 +127,6 @@ Application Framework.</description>
        <file name="Mail.php" role="php" />
        <file name="Mapper.php" role="php" />
        <file name="MimeViewer.php" role="php" />
-       <file name="Notification.php" role="php" />
        <file name="ShareFactory.php" role="php" />
        <file name="Template.php" role="php" />
        <file name="TextFilter.php" role="php" />
@@ -164,6 +163,7 @@ Application Framework.</description>
        <file name="LoginTasks.php" role="php" />
        <file name="Memcache.php" role="php" />
        <file name="MimeViewer.php" role="php" />
+       <file name="Notification.php" role="php" />
        <file name="Perms.php" role="php" />
        <file name="Prefs.php" role="php" />
        <file name="Request.php" role="php" />
@@ -446,7 +446,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Mail.php" name="lib/Horde/Core/Binder/Mail.php" />
    <install as="Horde/Core/Binder/Mapper.php" name="lib/Horde/Core/Binder/Mapper.php" />
    <install as="Horde/Core/Binder/MimeViewer.php" name="lib/Horde/Core/Binder/MimeViewer.php" />
-   <install as="Horde/Core/Binder/Notification.php" name="lib/Horde/Core/Binder/Notification.php" />
    <install as="Horde/Core/Binder/ShareFactory.php" name="lib/Horde/Core/Binder/ShareFactory.php" />
    <install as="Horde/Core/Binder/Template.php" name="lib/Horde/Core/Binder/Template.php" />
    <install as="Horde/Core/Binder/TextFilter.php" name="lib/Horde/Core/Binder/TextFilter.php" />
@@ -479,6 +478,7 @@ Application Framework.</description>
    <install as="Horde/Core/Factory/LoginTasks.php" name="lib/Horde/Core/Factory/LoginTasks.php" />
    <install as="Horde/Core/Factory/Memcache.php" name="lib/Horde/Core/Factory/Memcache.php" />
    <install as="Horde/Core/Factory/MimeViewer.php" name="lib/Horde/Core/Factory/MimeViewer.php" />
+   <install as="Horde/Core/Factory/Notification.php" name="lib/Horde/Core/Factory/Notification.php" />
    <install as="Horde/Core/Factory/Perms.php" name="lib/Horde/Core/Factory/Perms.php" />
    <install as="Horde/Core/Factory/Prefs.php" name="lib/Horde/Core/Factory/Prefs.php" />
    <install as="Horde/Core/Factory/Request.php" name="lib/Horde/Core/Factory/Request.php" />
@@ -575,7 +575,7 @@ Initial packaging
     <release>beta</release>
     <api>beta</api>
    </stability>
-   <date>2010-10-03</date>
+   <date>2010-10-04</date>
    <license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
    <notes>
 * Add Horde::addInlineJsVars().