Revert "Use ondemand injector binding throughout Horde"

This reverts commit 3b84d04919accf91428a760b2ba7921a543d3909.

Conflicts:

	framework/Core/lib/Horde/Registry.php
	imp/lib/Application.php

diff --git a/ansel/lib/Application.php b/ansel/lib/Application.php
index 5d33b2b..cd2a30f 100644 (file)
--- a/ansel/lib/Application.php
+++ b/ansel/lib/Application.php
@@ -66,12 +66,12 @@ class Ansel_Application extends Horde_Registry_Application
         }
 
         $binders = array(
-            'Ansel_Styles' => 'Ansel_Injector_Binder_Styles',
-            'Ansel_Faces' => 'Ansel_Injector_Binder_Faces',
-            'Ansel_Storage' => 'Ansel_Injector_Binder_Storage'
+            'Ansel_Styles' => new Ansel_Injector_Binder_Styles(),
+            'Ansel_Faces' => new Ansel_Injector_Binder_Faces(),
+            'Ansel_Storage' => new Ansel_Injector_Binder_Storage()
         );
         foreach ($binders as $interface => $binder) {
-            $GLOBALS['injector']->addOndemandBinder($interface, $binder);
+            $GLOBALS['injector']->addBinder($interface, $binder);
         }
 
         // Create db, share, and vfs instances.

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 0d80281..f37fcb4 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -264,36 +264,34 @@ class Horde_Registry
 
         /* Define binders. */
         $binders = array(
-            'Horde_Auth_Factory' => 'Horde_Core_Binder_AuthFactory',
-            // 'Horde_Browser' - initialized below
-            'Horde_Core_Auth_Signup' => 'Horde_Core_Binder_AuthSignup',
-            'Horde_Crypt' => 'Horde_Core_Binder_Crypt',
-            'Horde_Data' => 'Horde_Core_Binder_Data',
-            'Horde_Db' => 'Horde_Core_Binder_Db',
-            'Horde_Db_Adapter' => 'Horde_Core_Binder_DbBase',
-            'Horde_Db_Pear' => 'Horde_Core_Binder_DbPear',
-            'Horde_Group' => 'Horde_Core_Binder_Group',
-            'Horde_History' => 'Horde_Core_Binder_History',
-            'Horde_Http_Client' => 'Horde_Core_Binder_HttpClient',
-            'Horde_Ldap' => 'Horde_Core_Binder_Ldap',
-            'Horde_Log_Logger' => 'Horde_Core_Binder_Logger',
-            'Horde_LoginTasks' => 'Horde_Core_Binder_LoginTasks',
-            'Horde_Mail' => 'Horde_Core_Binder_Mail',
-            'Horde_Memcache' => 'Horde_Core_Binder_Memcache',
-            'Horde_Mime_Viewer' => 'Horde_Core_Binder_MimeViewer',
-            'Horde_Notification' => 'Horde_Core_Binder_Notification',
-            'Horde_Prefs_Identity' => 'Horde_Core_Binder_Identity',
-            // 'Horde_Registry' - initialized below
-            'Horde_Secret' => 'Horde_Core_Binder_Secret',
-            'Horde_Service_Facebook' => 'Horde_Core_Binder_Facebook',
-            'Horde_SessionHandler' => 'Horde_Core_Binder_SessionHandler',
-            'Horde_Share_Factory' => 'Horde_Core_Binder_ShareFactory',
-            'Horde_Template' => 'Horde_Core_Binder_Template',
-            'Horde_Text_Filter' => 'Horde_Core_Binder_TextFilter',
-            'Horde_Tree' => 'Horde_Core_Binder_Tree',
-            'Horde_Token' => 'Horde_Core_Binder_Token',
-            'Horde_Vfs' => 'Horde_Core_Binder_Vfs',
-            'Horde_Rpc_ActiveSync' => 'Horde_Core_Binder_ActiveSync'
+            'Horde_Auth_Factory' => new Horde_Core_Binder_AuthFactory(),
+            'Horde_Core_Auth_Signup' => new Horde_Core_Binder_AuthSignup(),
+            'Horde_Crypt' => new Horde_Core_Binder_Crypt(),
+            'Horde_Data' => new Horde_Core_Binder_Data(),
+            'Horde_Db' => new Horde_Core_Binder_Db(),
+            'Horde_Db_Adapter' => new Horde_Core_Binder_DbBase(),
+            'Horde_Db_Pear' => new Horde_Core_Binder_DbPear(),
+            'Horde_History' => new Horde_Core_Binder_History(),
+            'Horde_Http_Client' => new Horde_Core_Binder_HttpClient(),
+            'Horde_Ldap' => new Horde_Core_Binder_Ldap(),
+            'Horde_Log_Logger' => new Horde_Core_Binder_Logger(),
+            'Horde_LoginTasks' => new Horde_Core_Binder_LoginTasks(),
+            'Horde_Mail' => new Horde_Core_Binder_Mail(),
+            'Horde_Memcache' => new Horde_Core_Binder_Memcache(),
+            'Horde_Mime_Viewer' => new Horde_Core_Binder_MimeViewer(),
+            'Horde_Notification' => new Horde_Core_Binder_Notification(),
+            'Horde_Prefs_Identity' => new Horde_Core_Binder_Identity(),
+            'Horde_Rpc_ActiveSync' => new Horde_Core_Binder_ActiveSync(),
+            'Horde_Secret' => new Horde_Core_Binder_Secret(),
+            'Horde_Service_Facebook' => new Horde_Core_Binder_Facebook(),
+            'Horde_Service_Twitter' => new Horde_Core_Binder_Twitter(),
+            'Horde_SessionHandler' => new Horde_Core_Binder_SessionHandler(),
+            'Horde_Share_Factory' => new Horde_Core_Binder_ShareFactory(),
+            'Horde_Template' => new Horde_Core_Binder_Template(),
+            'Horde_Text_Filter' => new Horde_Core_Binder_TextFilter(),
+            'Horde_Tree' => new Horde_Core_Binder_Tree(),
+            'Horde_Token' => new Horde_Core_Binder_Token(),
+            'Horde_Vfs' => new Horde_Core_Binder_Vfs(),
         );
 
         /* Define factories. */
@@ -365,7 +363,7 @@ class Horde_Registry
         $GLOBALS['injector'] = $injector = new Horde_Injector(new Horde_Injector_TopLevel());
 
         foreach ($binders as $key => $val) {
-            $injector->addOndemandBinder($key, $val);
+            $injector->addBinder($key, $val);
         }
         foreach ($factories as $key => $val) {
             $injector->bindFactory($key, $val[0], $val[1]);

diff --git a/horde/lib/Prefs/Ui.php b/horde/lib/Prefs/Ui.php
index 6be4cc3..bb49fc1 100644 (file)
--- a/horde/lib/Prefs/Ui.php
+++ b/horde/lib/Prefs/Ui.php
@@ -450,6 +450,7 @@ class Horde_Prefs_Ui
     {
         global $prefs;
 
+        /* Horde_Service_Facebook */
         try {
             $facebook = $GLOBALS['injector']->getInstance('Horde_Service_Facebook');
         } catch (Horde_Exception $e) {
@@ -764,6 +765,7 @@ class Horde_Prefs_Ui
     {
         global $prefs;
 
+        /* Horde_Service_Facebook */
         try {
             $facebook = $GLOBALS['injector']->getInstance('Horde_Service_Facebook');
         } catch (Horde_Exception $e) {

diff --git a/imp/lib/Application.php b/imp/lib/Application.php
index dba02fa..7443a13 100644 (file)
--- a/imp/lib/Application.php
+++ b/imp/lib/Application.php
@@ -90,24 +90,24 @@ class IMP_Application extends Horde_Registry_Application
     {
         /* Add IMP-specific binders. */
         $binders = array(
-            'IMP_AuthImap' => 'IMP_Injector_Binder_AuthImap',
-            'IMP_Compose' => 'IMP_Injector_Binder_Compose',
-            'IMP_Contents' => 'IMP_Injector_Binder_Contents',
-            'IMP_Crypt_Pgp' => 'IMP_Injector_Binder_Pgp',
-            'IMP_Crypt_Smime' => 'IMP_Injector_Binder_Smime',
-            'IMP_Identity' => 'IMP_Injector_Binder_Identity',
-            'IMP_Imap' => 'IMP_Injector_Binder_Imap',
-            'IMP_Imap_Tree' => 'IMP_Injector_Binder_Imaptree',
-            'IMP_Mail' => 'IMP_Injector_Binder_Mail',
-            'IMP_Mailbox_List' => 'IMP_Injector_Binder_MailboxList',
-            'IMP_Mime_Viewer' => 'IMP_Injector_Binder_MimeViewer',
-            'IMP_Quota' => 'IMP_Injector_Binder_Quota',
-            'IMP_Search' => 'IMP_Injector_Binder_Search',
-            'IMP_Sentmail' => 'IMP_Injector_Binder_Sentmail'
+            'IMP_AuthImap' => new IMP_Injector_Binder_AuthImap(),
+            'IMP_Compose' => new IMP_Injector_Binder_Compose(),
+            'IMP_Contents' => new IMP_Injector_Binder_Contents(),
+            'IMP_Crypt_Pgp' => new IMP_Injector_Binder_Pgp(),
+            'IMP_Crypt_Smime' => new IMP_Injector_Binder_Smime(),
+            'IMP_Identity' => new IMP_Injector_Binder_Identity(),
+            'IMP_Imap' => new IMP_Injector_Binder_Imap(),
+            'IMP_Imap_Tree' => new IMP_Injector_Binder_Imaptree(),
+            'IMP_Mail' => new IMP_Injector_Binder_Mail(),
+            'IMP_Mailbox_List' => new IMP_Injector_Binder_MailboxList(),
+            'IMP_Mime_Viewer' => new IMP_Injector_Binder_MimeViewer(),
+            'IMP_Quota' => new IMP_Injector_Binder_Quota(),
+            'IMP_Search' => new IMP_Injector_Binder_Search(),
+            'IMP_Sentmail' => new IMP_Injector_Binder_Sentmail()
         );
 
         foreach ($binders as $key => $val) {
-            $GLOBALS['injector']->addOndemandBinder($key, $val);
+            $GLOBALS['injector']->addBinder($key, $val);
         }
 
         // Set default message character set.

diff --git a/jonah/lib/Application.php b/jonah/lib/Application.php
index dc1df58..fb87b4e 100644 (file)
--- a/jonah/lib/Application.php
+++ b/jonah/lib/Application.php
@@ -34,7 +34,7 @@ class Jonah_Application extends Horde_Registry_Application
      */
     protected function _init()
     {
-        $GLOBALS['injector']->addOndemandBinder('Jonah_Driver', 'Jonah_Injector_Binder_Driver');
+        $GLOBALS['injector']->addBinder('Jonah_Driver', new Jonah_Injector_Binder_Driver());
     }
 
     /**

diff --git a/turba/lib/Application.php b/turba/lib/Application.php
index 7d05cc5..36d17bf 100644 (file)
--- a/turba/lib/Application.php
+++ b/turba/lib/Application.php
@@ -61,11 +61,11 @@ class Turba_Application extends Horde_Registry_Application
     {
         /* Add Turba-specific binders. */
         $binders = array(
-            'Turba_Driver' => 'Turba_Injector_Binder_Driver'
+            'Turba_Driver' => new Turba_Injector_Binder_Driver()
         );
 
         foreach ($binders as $key => $val) {
-            $GLOBALS['injector']->addOndemandBinder($key, $val);
+            $GLOBALS['injector']->addBinder($key, $val);
         }
 
         // Turba source and attribute configuration.