Use factory for Horde_Facebook

diff --git a/framework/Core/lib/Horde/Core/Binder/Facebook.php b/framework/Core/lib/Horde/Core/Binder/Facebook.php
deleted file mode 100644 (file)
index c118f01..0000000
--- a/framework/Core/lib/Horde/Core/Binder/Facebook.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package Core
- */
-class Horde_Core_Binder_Facebook implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        global $conf;
-
-        if (empty($conf['facebook']['key']) || empty($conf['facebook']['secret'])) {
-            throw new Horde_Exception('Unable to find required Facebook configuration.');
-        }
-
-        /* Facebook key and secret */
-        $apikey = $conf['facebook']['key'];
-        $secret = $conf['facebook']['secret'];
-
-        /* Create required objects */
-        $context = array('http_client' => $injector->getInstance('Horde_Http_Client')->getClient(),
-                         'http_request' => $injector->getInstance('Horde_Controller_Request_Http'));
-
-        return new Horde_Service_Facebook($apikey, $secret, $context);
-    }
-
-    public function equals (Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}
\ No newline at end of file

diff --git a/framework/Core/lib/Horde/Core/Factory/Facebook.php b/framework/Core/lib/Horde/Core/Factory/Facebook.php
new file mode 100644 (file)
index 0000000..67269e4
--- /dev/null
+++ b/framework/Core/lib/Horde/Core/Factory/Facebook.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @category Horde
+ * @package Core
+ */
+class Horde_Core_Factory_Facebook
+{
+    public function create(Horde_Injector $injector)
+    {
+        global $conf;
+
+        if (empty($conf['facebook']['key']) || empty($conf['facebook']['secret'])) {
+            throw new Horde_Exception('Unable to find required Facebook configuration.');
+        }
+
+        /* Facebook key and secret */
+        $apikey = $conf['facebook']['key'];
+        $secret = $conf['facebook']['secret'];
+
+        /* Create required objects */
+        $context = array('http_client' => $injector->getInstance('Horde_Http_Client')->getClient(),
+                         'http_request' => $injector->getInstance('Horde_Controller_Request_Http'));
+
+        return new Horde_Service_Facebook($apikey, $secret, $context);
+    }
+
+}
\ No newline at end of file

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index ca56076..7bbb96a 100644 (file)
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -282,7 +282,6 @@ class Horde_Registry
             'Horde_Notification' => new Horde_Core_Binder_Notification(),
             'Horde_Prefs_Identity' => new Horde_Core_Binder_Identity(),
             'Horde_Secret' => new Horde_Core_Binder_Secret(),
-            'Horde_Service_Facebook' => new Horde_Core_Binder_Facebook(),
             'Horde_SessionHandler' => new Horde_Core_Binder_SessionHandler(),
             'Horde_Share_Factory' => new Horde_Core_Binder_ShareFactory(),
             'Horde_Template' => new Horde_Core_Binder_Template(),
@@ -314,6 +313,10 @@ class Horde_Registry
                 'Horde_Core_Factory_Editor',
                 'create',
             ),
+            'Horde_Facebook' => array(
+                'Horde_Core_Factory_Facebook',
+                'create',
+            ),
             'Horde_Kolab_Server_Composite' => array(
                 'Horde_Core_Factory_KolabServer',
                 'getComposite',

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 6a556a5..b77ae0a 100644 (file)
--- a/framework/Core/package.xml
+++ b/framework/Core/package.xml
@@ -118,7 +118,6 @@ Application Framework.</description>
        <file name="Db.php" role="php" />
        <file name="DbBase.php" role="php" />
        <file name="DbPear.php" role="php" />
-       <file name="Facebook.php" role="php" />
        <file name="Group.php" role="php" />
        <file name="History.php" role="php" />
        <file name="HttpClient.php" role="php" />
@@ -157,6 +156,7 @@ Application Framework.</description>
        <file name="DbPear.php" role="php" />
        <file name="Dns.php" role="php" />
        <file name="Editor.php" role="php" />
+       <file name="Facebook.php" role="php" />
        <file name="HttpClient.php" role="php" />
        <file name="Identity.php" role="php" />
        <file name="Imple.php" role="php" />
@@ -438,7 +438,6 @@ Application Framework.</description>
    <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" />
-   <install as="Horde/Core/Binder/Facebook.php" name="lib/Horde/Core/Binder/Facebook.php" />
    <install as="Horde/Core/Binder/Group.php" name="lib/Horde/Core/Binder/Group.php" />
    <install as="Horde/Core/Binder/History.php" name="lib/Horde/Core/Binder/History.php" />
    <install as="Horde/Core/Binder/HttpClient.php" name="lib/Horde/Core/Binder/HttpClient.php" />
@@ -473,6 +472,7 @@ Application Framework.</description>
    <install as="Horde/Core/Factory/DbPear.php" name="lib/Horde/Core/Factory/DbPear.php" />
    <install as="Horde/Core/Factory/Dns.php" name="lib/Horde/Core/Factory/Dns.php" />
    <install as="Horde/Core/Factory/Editor.php" name="lib/Horde/Core/Factory/Editor.php" />
+   <install as="Horde/Core/Factory/Facebook.php" name="lib/Horde/Core/Factory/Facebook.php" />
    <install as="Horde/Core/Factory/HttpClient.php" name="lib/Horde/Core/Factory/HttpClient.php" />
    <install as="Horde/Core/Factory/Identity.php" name="lib/Horde/Core/Factory/Identity.php" />
    <install as="Horde/Core/Factory/Imple.php" name="lib/Horde/Core/Factory/Imple.php" />