factory for Horde_Dns

diff --git a/framework/Core/lib/Horde/Core/Binder/Dns.php b/framework/Core/lib/Horde/Core/Binder/Dns.php
deleted file mode 100644 (file)
index d7c107b..0000000
--- a/framework/Core/lib/Horde/Core/Binder/Dns.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * @category Horde
- * @package  Core
- */
-class Horde_Core_Binder_Dns implements Horde_Injector_Binder
-{
-    public function create(Horde_Injector $injector)
-    {
-        /* Need check for Net_DNS since it defines global variables used
-         * in Net_DNS_Resolver::. */
-        if (!class_exists('Net_DNS')) {
-            return null;
-        }
-
-        $resolver = new Net_DNS_Resolver();
-        $resolver->retry = isset($GLOBALS['conf']['dns']['retry'])
-            ? $GLOBALS['conf']['dns']['retry']
-            : 1;
-        $resolver->retrans = isset($GLOBALS['conf']['dns']['retrans'])
-            ? $GLOBALS['conf']['dns']['retrans']
-            : 1;
-
-        return $resolver;
-    }
-
-    public function equals(Horde_Injector_Binder $binder)
-    {
-        return false;
-    }
-}

diff --git a/framework/Core/lib/Horde/Core/Factory/Dns.php b/framework/Core/lib/Horde/Core/Factory/Dns.php
new file mode 100644 (file)
index 0000000..9fcce91
--- /dev/null
+++ b/framework/Core/lib/Horde/Core/Factory/Dns.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * @category Horde
+ * @package  Core
+ */
+class Horde_Core_Factory_Dns
+{
+    public function create(Horde_Injector $injector)
+    {
+        /* Need check for Net_DNS since it defines global variables used
+         * in Net_DNS_Resolver::. */
+        if (!class_exists('Net_DNS')) {
+            return null;
+        }
+
+        $resolver = new Net_DNS_Resolver();
+        $resolver->retry = isset($GLOBALS['conf']['dns']['retry'])
+            ? $GLOBALS['conf']['dns']['retry']
+            : 1;
+        $resolver->retrans = isset($GLOBALS['conf']['dns']['retrans'])
+            ? $GLOBALS['conf']['dns']['retrans']
+            : 1;
+
+        return $resolver;
+    }
+
+}

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
index 71ae8c7..2eff284 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="Dns.php" role="php" />
        <file name="Facebook.php" role="php" />
        <file name="Group.php" role="php" />
        <file name="History.php" role="php" />
@@ -158,6 +157,7 @@ Application Framework.</description>
        <file name="Data.php" role="php" />
        <file name="Db.php" role="php" />
        <file name="DbPear.php" role="php" />
+       <file name="Dns.php" role="php" />
        <file name="Editor.php" role="php" />
        <file name="HttpClient.php" role="php" />
        <file name="Identity.php" role="php" />
@@ -439,7 +439,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/Dns.php" name="lib/Horde/Core/Binder/Dns.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" />
@@ -475,6 +474,7 @@ Application Framework.</description>
    <install as="Horde/Core/Factory/Data.php" name="lib/Horde/Core/Factory/Data.php" />
    <install as="Horde/Core/Factory/Db.php" name="lib/Horde/Core/Factory/Db.php" />
    <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/HttpClient.php" name="lib/Horde/Core/Factory/HttpClient.php" />
    <install as="Horde/Core/Factory/Identity.php" name="lib/Horde/Core/Factory/Identity.php" />