From: Chuck Hagenbuch <chuck@horde.org>
Date: Fri, 11 Jun 2010 14:29:38 +0000 (-0400)
Subject: Make Horde_Injector_DependencyFinder optional to Binders that use it
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4580da9905271c5170d31f7c7ce18c09273975cb;p=horde.git

Make Horde_Injector_DependencyFinder optional to Binders that use it
---

diff --git a/framework/Injector/lib/Horde/Injector/Binder/AnnotatedSetters.php b/framework/Injector/lib/Horde/Injector/Binder/AnnotatedSetters.php
index d1115ed6d..0b964b6c5 100644
--- a/framework/Injector/lib/Horde/Injector/Binder/AnnotatedSetters.php
+++ b/framework/Injector/lib/Horde/Injector/Binder/AnnotatedSetters.php
@@ -25,9 +25,11 @@ class Horde_Injector_Binder_AnnotatedSetters implements Horde_Injector_Binder
     /**
      *
      */
-    public function __construct(Horde_Injector_Binder $binder, Horde_Injector_DependencyFinder $dependencyFinder)
+    public function __construct(Horde_Injector_Binder $binder, Horde_Injector_DependencyFinder $dependencyFinder = null)
     {
         $this->_binder = $binder;
+
+        if (is_null($dependencyFinder)) { $dependencyFinder = new Horde_Injector_DependencyFinder(); }
         $this->_dependencyFinder = $dependencyFinder;
     }
 
diff --git a/framework/Injector/lib/Horde/Injector/Binder/Implementation.php b/framework/Injector/lib/Horde/Injector/Binder/Implementation.php
index ebfe253c2..86d350d5a 100644
--- a/framework/Injector/lib/Horde/Injector/Binder/Implementation.php
+++ b/framework/Injector/lib/Horde/Injector/Binder/Implementation.php
@@ -26,9 +26,7 @@ class Horde_Injector_Binder_Implementation implements Horde_Injector_Binder
     {
         $this->_implementation = $implementation;
 
-        if (is_null($dependencyFinder)) {
-            $dependencyFinder = new Horde_Injector_DependencyFinder();
-        }
+        if (is_null($dependencyFinder)) { $dependencyFinder = new Horde_Injector_DependencyFinder(); }
         $this->_dependencyFinder = $dependencyFinder;
     }