Move app Injector/Factory to just Factory/

Mirrors use of Horde_Core_Factory. Additionally, these factory injectors don't extend any Horde_Injector class.
iutbay · Jan 27, 2011 · e308281 · e308281
1 parent e4b7e63
commit e308281
Show file tree

Hide file tree

Showing 28 changed files with 62 additions and 62 deletions.
diff --git a/add.php b/add.php
@@ -34,7 +34,7 @@
 /* A source has been selected, connect and set up the fields. */
 if ($source) {
     try {
-        $driver = $injector->getInstance('Turba_Injector_Factory_Driver')->create($source);
+        $driver = $injector->getInstance('Turba_Factory_Driver')->create($source);
     } catch (Turba_Exception $e) {
         $notification->push($e, 'horde.error');
         $driver = null;

diff --git a/contact.php b/contact.php
@@ -22,7 +22,7 @@
 
 /* Set the contact from the key requested. */
 try {
-    $driver = $injector->getInstance('Turba_Injector_Factory_Driver')->create($source);
+    $driver = $injector->getInstance('Turba_Factory_Driver')->create($source);
 } catch (Turba_Exception $e) {
     $notification->push($e, 'horde.error');
     Horde::url($prefs->getValue('initial_page'), true)->redirect();

diff --git a/data.php b/data.php
@@ -242,7 +242,7 @@ function _getBareEmail($address, $allow_multi = false)
     foreach ($sources as $source => $objectkeys) {
         /* Create a Turba storage instance. */
         try {
-            $driver = $injector->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $injector->getInstance('Turba_Factory_Driver')->create($source);
         } catch (Turba_Exception $e) {
             $notification->push($e, 'horde.error');
             $error = true;
@@ -335,7 +335,7 @@ function _getBareEmail($address, $allow_multi = false)
 case Horde_Data::IMPORT_FILE:
     $dest = Horde_Util::getFormData('dest');
     try {
-        $driver = $injector->getInstance('Turba_Injector_Factory_Driver')->create($dest);
+        $driver = $injector->getInstance('Turba_Factory_Driver')->create($dest);
     } catch (Turba_Exception $e) {
         $notification->push($e, 'horde.error');
         $error = true;
@@ -423,7 +423,7 @@ function _getBareEmail($address, $allow_multi = false)
     /* Create a Turba storage instance. */
     $dest = $session->get('horde', 'import_data/target');
     try {
-        $driver = $injector->getInstance('Turba_Injector_Factory_Driver')->create($dest);
+        $driver = $injector->getInstance('Turba_Factory_Driver')->create($dest);
     } catch (Turba_Exception $e) {
         $notification->push($e, 'horde.error');
         $driver = null;

diff --git a/delete.php b/delete.php
@@ -18,7 +18,7 @@
 
 $source = Horde_Util::getFormData('source');
 $key = Horde_Util::getFormData('key');
-$driver = $injector->getInstance('Turba_Injector_Factory_Driver')->create($source);
+$driver = $injector->getInstance('Turba_Factory_Driver')->create($source);
 
 if ($conf['documents']['type'] != 'none') {
     try {

diff --git a/deletefile.php b/deletefile.php
@@ -23,7 +23,7 @@
     Horde::url($prefs->getValue('initial_page'), true)->redirect();
 }
 
-$driver = $injector->getInstance('Turba_Injector_Factory_Driver')->create($source);
+$driver = $injector->getInstance('Turba_Factory_Driver')->create($source);
 
 try {
     $contact = $driver->getObject(Horde_Util::getPost('key'));

diff --git a/edit.php b/edit.php
@@ -45,7 +45,7 @@
     $url->redirect();
 }
 
-$driver = $injector->getInstance('Turba_Injector_Factory_Driver')->create($source);
+$driver = $injector->getInstance('Turba_Factory_Driver')->create($source);
 
 /* Set the contact from the requested key. */
 try {

diff --git a/lib/Api.php b/lib/Api.php
@@ -51,7 +51,7 @@ public function commentCallback($id)
         @list($source, $key) = explode('.', $id, 2);
         if (isset($GLOBALS['cfgSources'][$source]) && $key) {
             try {
-                $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+                $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
                 $object = $driver->getObject($key)->getValue('name');
             } catch (Turba_Exception $e) {}
         }
@@ -134,7 +134,7 @@ public function getDefaultShare()
                 }
 
                 try {
-                    $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($params['source']);
+                    $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($params['source']);
                     if ($driver->checkDefaultShare($share, $cfgSources[$params['source']])) {
                         return $uid;
                     }
@@ -322,7 +322,7 @@ public function browse($path = '', $properties = array())
             }
 
             // Load the Turba driver.
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($parts[1]);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($parts[1]);
 
             $contacts = $driver->search(array());
 
@@ -371,7 +371,7 @@ public function browse($path = '', $properties = array())
             }
 
             // Load the Turba driver.
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($parts[1]);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($parts[1]);
 
             $contact = $driver->getObject($parts[2]);
 
@@ -418,7 +418,7 @@ public function path_delete($path)
         }
 
         // Load the Turba driver.
-        $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($parts[1]);
+        $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($parts[1]);
 
         return $driver->delete($parts[2]);
     }
@@ -458,7 +458,7 @@ public function listUids($sources = null)
                 throw new Turba_Exception(sprintf(_("Invalid address book: %s"), $source));
             }
 
-            $storage = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $storage = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
             try {
                 $results = $storage->search(array());
@@ -518,7 +518,7 @@ public function listBy($action, $timestamp, $sources = null, $end = null)
                 throw new Turba_Exception(sprintf(_("Invalid address book: %s"), $source));
             }
 
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
             $histories = $history->getByTimestamp(
                 '>', $timestamp, $filter,
@@ -589,7 +589,7 @@ public function getActionTimestamp($uid, $action, $sources = null)
                 throw new Turba_Exception(sprintf(_("Invalid address book: %s"), $source));
             }
 
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
             $ts = $history->getActionTimestamp('turba:' . $driver->getName()
                 . ':' . $uid,
@@ -635,7 +635,7 @@ public function import($content, $contentType = 'array',
             throw new Turba_Exception(sprintf(_("Invalid address book: %s"), $import_source));
         }
 
-        $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($import_source);
+        $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($import_source);
 
         if (!$driver->hasPermission(Horde_Perms::EDIT)) {
             throw new Turba_Exception(_("Permission denied"));
@@ -763,7 +763,7 @@ public function export($uid, $contentType, $sources = null, $fields = null)
                 throw new Turba_Exception(_("Invalid ID"));
             }
 
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
             if (!$driver->hasPermission(Horde_Perms::READ)) {
                 continue;
@@ -827,7 +827,7 @@ public function export($uid, $contentType, $sources = null, $fields = null)
     public function ownVCard()
     {
         $contact = $this->getOwnContactObject();
-        $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($contact['source']);
+        $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($contact['source']);
 
         $vcard = $driver->tovCard($contact['contact'], '3.0', null, true);
         $vcard->setAttribute('VERSION', '3.0');
@@ -868,7 +868,7 @@ public function getOwnContactObject()
             throw new Turba_Exception(_("The address book with your own contact doesn't exist anymore."));
         }
 
-        $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+        $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
         if (!$driver->hasPermission(Horde_Perms::READ)) {
             throw new Turba_Exception(_("You don't have sufficient permissions to read the address book that contains your own contact."));
@@ -933,7 +933,7 @@ public function delete($uid, $sources = null)
                 throw new Turba_Exception(_("Invalid ID"));
             }
 
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
             if (!$GLOBALS['registry']->isAdmin() &&
                 !$driver->hasPermission(Horde_Perms::DELETE)) {
@@ -996,7 +996,7 @@ public function replace($uid, $content, $contentType, $sources = null)
             }
 
             // Check permissions.
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
             if (!$driver->hasPermission(Horde_Perms::EDIT)) {
                 continue;
             }
@@ -1121,7 +1121,7 @@ public function search($names = array(), $sources = array(),
                     continue;
                 }
 
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
             // Determine the name of the column to sort by.
             $columns = isset($sort_columns[$source])
@@ -1274,7 +1274,7 @@ public function getContact($source = null, $objectId = '')
         }
 
         if (isset($cfgSources[$source])) {
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
             $object = $driver->getObject($objectId);
 
@@ -1310,7 +1310,7 @@ public function getContacts($source = '', $objectIds = array())
         }
 
         if (isset($cfgSources[$source])) {
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
             $objects = $driver->getObjects($objectIds);
 
@@ -1351,7 +1351,7 @@ public function getAllAttributeValues($field = '', $sources = array())
         $results = array();
         foreach ($sources as $source) {
             if (isset($cfgSources[$source])) {
-                $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+                $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
                 $res = $driver->search(array());
                 if (!($res instanceof Turba_List)) {
@@ -1419,7 +1419,7 @@ public function listTimeObjects($time_categories, $start, $end)
         $objects = array();
         foreach ($time_categories as $category) {
             list($category, $source) = explode('/', $category, 2);
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
             $objects = array_merge($objects, $driver->listTimeObjects($start, $end, $category));
         }
 
@@ -1563,7 +1563,7 @@ public function addField($address = '', $name = '', $field = '',
             throw new Turba_Exception(_("Invalid entry"));
         }
 
-        $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+        $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
 
         if (!$driver->hasPermission(Horde_Perms::EDIT)) {
             throw new Turba_Exception(_("Permission denied"));
@@ -1654,7 +1654,7 @@ public function getField($address = '', $field = '', $sources = array(),
                 continue;
             }
 
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
             $criterium = array('email' => $address);
             if (!isset($driver->map['email'])) {
                 if (isset($driver->map['emails'])) {
@@ -1719,7 +1719,7 @@ public function deleteField($address = '', $field = '', $sources = array())
 
         foreach ($sources as $source) {
             if (isset($cfgSources[$source])) {
-                $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+                $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
                 if (!$driver->hasPermission(Horde_Perms::EDIT)) {
                     continue;
                 }

diff --git a/lib/Application.php b/lib/Application.php
@@ -400,7 +400,7 @@ public function removeUserData($user)
             if (empty($source['use_shares'])) {
                 // Shares not enabled for this source
                 try {
-                    $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+                    $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
                 } catch (Turba_Exception $e) {
                     Horde::logMessage($e, 'ERR');
                     throw new Turba_Exception(sprintf(_("There was an error removing an address book for %s"), $user));
@@ -433,7 +433,7 @@ public function removeUserData($user)
             if (!empty($params['default'])) {
                 $config = Turba::getSourceFromShare($share);
                 try {
-                    $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($config);
+                    $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($config);
                 } catch (Turba_Exception $e) {
                     continue;
                 }

diff --git a/lib/Driver/Share.php b/lib/Driver/Share.php
@@ -44,7 +44,7 @@ public function __construct($name = '', array $params = array())
     {
         parent::__construct($name, $params);
         $this->_share = $this->_params['config']['params']['share'];
-        $this->_driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($this->_params['config']);
+        $this->_driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($this->_params['config']);
     }
 
     /**

diff --git a/lib/Driver/Vbook.php b/lib/Driver/Vbook.php
@@ -41,7 +41,7 @@ public function __construct($name = '', array $params = array())
         $this->_share = $this->_params['share'];
 
         /* Load the underlying driver. */
-        $this->_driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($this->_params['source']);
+        $this->_driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($this->_params['source']);
 
         $this->searchCriteria = empty($this->_params['criteria'])
             ? array()

diff --git a/lib/Injector/Factory/Driver.php → lib/Factory/Driver.php b/lib/Injector/Factory/Driver.php → lib/Factory/Driver.php
@@ -25,7 +25,7 @@
  * @link     http://pear.horde.org/index.php?package=Turba
  * @package  Turba
  */
-class Turba_Injector_Factory_Driver
+class Turba_Factory_Driver
 {
     /**
      * Instances.

diff --git a/lib/Form/CreateAddressBook.php b/lib/Form/CreateAddressBook.php
@@ -35,7 +35,7 @@ public function execute()
         // Need a clean cfgSources array
         include TURBA_BASE . '/config/backends.php';
 
-        $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($cfgSources[$GLOBALS['conf']['shares']['source']]);
+        $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($cfgSources[$GLOBALS['conf']['shares']['source']]);
 
         $params = array(
             'params' => array('source' => $GLOBALS['conf']['shares']['source']),

diff --git a/lib/Form/DeleteAddressBook.php b/lib/Form/DeleteAddressBook.php
@@ -50,7 +50,7 @@ public function execute()
             throw new Turba_Exception(_("You do not have permissions to delete this address book."));
         }
 
-        $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($this->_addressbook->getName());
+        $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($this->_addressbook->getName());
 
         // We have a Turba_Driver, try to delete the address book.
         $driver->deleteAll();

diff --git a/lib/List.php b/lib/List.php
@@ -38,7 +38,7 @@ public function __construct(array $ids = array())
         foreach ($ids as $value) {
             list($source, $key) = explode(':', $value);
             try {
-                $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+                $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
                 $this->insert($driver->getObject($key));
             } catch (Turba_Exception $e) {}
         }

diff --git a/lib/LoginTasks/SystemTask/UpgradeLists.php b/lib/LoginTasks/SystemTask/UpgradeLists.php
@@ -40,7 +40,7 @@ public function execute()
             $sources = array_keys($GLOBALS['cfgSources']);
             foreach ($sources as $sourcekey) {
                 try {
-                    $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($sourcekey);
+                    $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($sourcekey);
                     $lists = $driver->search($criteria);
                 } catch (Turba_Exception $e) {
                     return false;

diff --git a/lib/Object/Group.php b/lib/Object/Group.php
@@ -69,7 +69,7 @@ public function addMember($contactId, $sourceId = null)
         if ($sourceId == $this->getSource()) {
             $contact = $this->driver->getObject($contactId);
         } else {
-            $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($sourceId);
+            $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($sourceId);
             $contact = $driver->getObject($contactId);
         }
 
@@ -172,7 +172,7 @@ public function listMembers($sort = null)
                 }
 
                 try {
-                    $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($sourceId);
+                    $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($sourceId);
                 } catch (Turba_Exception $e) {
                     continue;
                 }

diff --git a/lib/Turba.php b/lib/Turba.php
@@ -367,7 +367,7 @@ static public function permissionsFilter(array $in, $permission = Horde_Perms::R
 
         foreach ($in as $sourceId => $source) {
             try {
-                $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($sourceId);
+                $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($sourceId);
             } catch (Turba_Exception $e) {
                 Horde::logMessage($e, 'ERR');
                 continue;
@@ -454,7 +454,7 @@ static public function getConfigFromShares(array $sources)
             if ($GLOBALS['registry']->getAuth() && !$personal) {
                 // User's default share is missing.
                 try {
-                    $driver = $GLOBALS['injector']->getInstance('Turba_Injector_Factory_Driver')->create($source);
+                    $driver = $GLOBALS['injector']->getInstance('Turba_Factory_Driver')->create($source);
                 } catch (Turba_Exception $e) {
                     $GLOBALS['notification']->push($driver, 'horde.error');
                     continue;