Request Horde_Core_Factory_Data directly, remove binder.

diff --git a/framework/Core/lib/Horde/Core/Binder/Data.php b/framework/Core/lib/Horde/Core/Binder/Data.php
deleted file mode 100644 (file)
index 83d0df8..0000000
--- a/framework/Core/lib/Horde/Core/Binder/Data.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Data implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        return new Horde_Core_Factory_Data($injector);
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}

diff --git a/framework/Core/lib/Horde/Core/Factory/Data.php b/framework/Core/lib/Horde/Core/Factory/Data.php
index c20cc8f..2f8c221 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Data.php
+++ b/framework/Core/lib/Horde/Core/Factory/Data.php
@@ -53,7 +53,7 @@ class Horde_Core_Factory_Data
      * @return Horde_Data_Driver  The instance.
      * @throws Horde_Data_Exception
      */
-    public function getData($driver, array $params = array())
+    public function create($driver, array $params = array())
     {
         $params['browser'] = $this->_injector->getInstance('Horde_Browser');
         $params['vars'] = Horde_Variables::getDefaultVariables();

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 4b095fb..8680115 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -265,7 +265,6 @@ class Horde_Registry
         $binders = array(
             'Horde_Auth_Factory' => new Horde_Core_Binder_AuthFactory(),
             'Horde_Core_Auth_Signup' => new Horde_Core_Binder_AuthSignup(),
-            '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(),

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 64b6eed..15e3d97 100644 (file)
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -113,7 +113,6 @@ Application Framework.</description>
        <file name="Auth.php" role="php" />
        <file name="AuthFactory.php" role="php" />
        <file name="AuthSignup.php" role="php" />
-       <file name="Data.php" role="php" />
        <file name="Db.php" role="php" />
        <file name="DbBase.php" role="php" />
        <file name="DbPear.php" role="php" />
@@ -430,7 +429,6 @@ Application Framework.</description>
    <install as="Horde/Core/Binder/Auth.php" name="lib/Horde/Core/Binder/Auth.php" />
    <install as="Horde/Core/Binder/AuthFactory.php" name="lib/Horde/Core/Binder/AuthFactory.php" />
    <install as="Horde/Core/Binder/AuthSignup.php" name="lib/Horde/Core/Binder/AuthSignup.php" />
-   <install as="Horde/Core/Binder/Data.php" name="lib/Horde/Core/Binder/Data.php" />
    <install as="Horde/Core/Binder/Db.php" name="lib/Horde/Core/Binder/Db.php" />
    <install as="Horde/Core/Binder/DbBase.php" name="lib/Horde/Core/Binder/DbBase.php" />
    <install as="Horde/Core/Binder/DbPear.php" name="lib/Horde/Core/Binder/DbPear.php" />

diff --git a/mnemo/data.php b/mnemo/data.php
index d63fa48..f3bbc5c 100644 (file)
--- a/mnemo/data.php
+++ b/mnemo/data.php
@@ -82,7 +82,7 @@ case 'export':
                 unset($note['uid']);
                 $data[] = $note;
             }
-            $injector->getInstance('Horde_Data')->getData('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("notes.csv"), $data, true);
+            $injector->getInstance('Horde_Core_Factory_Data')->create('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("notes.csv"), $data, true);
             exit;
         }
     }
@@ -96,7 +96,7 @@ case Horde_Data::IMPORT_FILE:
 if (!$error && $import_format) {
     $data = null;
     try {
-        $data = $injector->getInstance('Horde_Data')->getData($import_format, array('cleanup' => '_cleanupData'));
+        $data = $injector->getInstance('Horde_Core_Factory_Data')->create($import_format, array('cleanup' => '_cleanupData'));
         $next_step = $data->nextStep($actionID, $param);
     } catch (Horde_Data_Exception $e) {
         if ($data) {

diff --git a/nag/data.php b/nag/data.php
index e585a34..72d9ff5 100644 (file)
--- a/nag/data.php
+++ b/nag/data.php
@@ -113,7 +113,7 @@ case 'export':
                 unset($task['delete_link']);
                 $data[] = $task;
             }
-            $injector->getInstance('Horde_Data')->getData('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("tasks.csv"), $data, true);
+            $injector->getInstance('Horde_Core_Factory_Data')->create('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("tasks.csv"), $data, true);
             exit;
 
         case Horde_Data::EXPORT_ICALENDAR:
@@ -140,7 +140,7 @@ case Horde_Data::IMPORT_FILE:
 if (!$error && $import_format) {
     $data = null;
     try {
-        $data = $injector->getInstance('Horde_Data')->getData($import_format, array('cleanup' => '_cleanupData'));
+        $data = $injector->getInstance('Horde_Core_Factory_Data')->create($import_format, array('cleanup' => '_cleanupData'));
         $next_step = $data->nextStep($actionID, $param);
     } catch (Horde_Data_Exception $e) {
         if ($data) {

diff --git a/operator/lib/Form/SearchCDR.php b/operator/lib/Form/SearchCDR.php
index aeacc9e..2a2e5a1 100644 (file)
--- a/operator/lib/Form/SearchCDR.php
+++ b/operator/lib/Form/SearchCDR.php
@@ -125,12 +125,12 @@ class ExportCDRForm extends SearchCDRForm
         switch($this->_vars->get('format')) {
         case Horde_Data::EXPORT_CSV:
             $ext = 'csv';
-            $fmt = $GLOBALS['injector']->getInstance('Horde_Data')->getData('Csv');
+            $fmt = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Data')->create('Csv');
             break;
 
         case Horde_Data::EXPORT_TSV:
             $ext = 'tsv';
-            $fmt = $GLOBALS['injector']->getInstance('Horde_Data')->getData('Tsv');
+            $fmt = $GLOBALS['injector']->getInstance('Horde_Core_Factory_Data')->create('Tsv');
             break;
 
         default:

diff --git a/turba/data.php b/turba/data.php
index b146e7d..d483dff 100644 (file)
--- a/turba/data.php
+++ b/turba/data.php
@@ -306,20 +306,20 @@ case 'export':
 
     switch ($exportType) {
     case Horde_Data::EXPORT_CSV:
-        $injector->getInstance('Horde_Data')->getData('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.csv"), $data, true);
+        $injector->getInstance('Horde_Core_Factory_Data')->create('Csv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.csv"), $data, true);
         exit;
 
     case Horde_Data::EXPORT_OUTLOOKCSV:
-        $injector->getInstance('Horde_Data')->getData('Outlookcsv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.csv"), $data, true, array_flip($outlook_mapping));
+        $injector->getInstance('Horde_Core_Factory_Data')->create('Outlookcsv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.csv"), $data, true, array_flip($outlook_mapping));
         exit;
 
     case Horde_Data::EXPORT_TSV:
-        $injector->getInstance('Horde_Data')->getData('Tsv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.tsv"), $data, true);
+        $injector->getInstance('Horde_Core_Factory_Data')->create('Tsv', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.tsv"), $data, true);
         exit;
 
     case Horde_Data::EXPORT_VCARD:
     case 'vcard30':
-        $injector->getInstance('Horde_Data')->getData('Vcard', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.vcf"), $data, true);
+        $injector->getInstance('Horde_Core_Factory_Data')->create('Vcard', array('cleanup' => '_cleanupData'))->exportFile(_("contacts.vcf"), $data, true);
         exit;
 
     case 'ldif':
@@ -386,7 +386,7 @@ if (!$error && !empty($import_format)) {
                 'cleanup' => '_cleanupData'
             ));
         } else {
-            $data = $injector->getInstance('Horde_Data')->getData($import_format, array('cleanup' => '_cleanupData'));
+            $data = $injector->getInstance('Horde_Core_Factory_Data')->create($import_format, array('cleanup' => '_cleanupData'));
         }
     } catch (Turba_Exception $e) {
         $notification->push(_("This file format is not supported."), 'horde.error');

diff --git a/turba/vcard.php b/turba/vcard.php
index 01ecc97..d3fbae5 100644 (file)
--- a/turba/vcard.php
+++ b/turba/vcard.php
@@ -40,4 +40,4 @@ if (!$filename) {
     $filename = _("contact");
 }
 
-$injector->getInstance('Horde_Data')->getData('Vcard')->exportFile($filename . '.vcf', array($driver->tovCard($object, '2.1', null, true)));
+$injector->getInstance('Horde_Core_Factory_Data')->create('Vcard')->exportFile($filename . '.vcf', array($driver->tovCard($object, '2.1', null, true)));