fixed regression in api

src-run · Sep 26, 2016 · 71e01d1 · 71e01d1
1 parent 4fa860b
commit 71e01d1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 57 deletions.
diff --git a/lib/CallSilencer.php b/lib/CallSilencer.php
@@ -78,11 +78,11 @@ final class CallSilencer implements CallSilencerInterface
      * Constructor allows for setting main closure or validation closure.
      *
      * @param \Closure|null $invokableInst Main invokable called in an error-silenced environment
-     * @param object        $invokableBind Binding for main invokable closure call
      * @param \Closure|null $validatorInst Validation checker that determines return value validity
+     * @param object        $invokableBind Binding for main invokable closure call
      * @param object        $validatorBind Binding for result validation closure
      */
-    public function __construct(\Closure $invokableInst = null, $invokableBind = null, \Closure $validatorInst = null, $validatorBind = null)
+    public function __construct(\Closure $invokableInst = null, \Closure $validatorInst = null, $invokableBind = null, $validatorBind = null)
     {
         $this->setInvokable($invokableInst, $invokableBind);
         $this->setValidator($validatorInst, $validatorBind);
@@ -98,7 +98,7 @@ public function __construct(\Closure $invokableInst = null, $invokableBind = nul
      */
     public static function create(\Closure $invokableInst = null, \Closure $validatorInst = null) : CallSilencerInterface
     {
-        return new static($invokableInst, null, $validatorInst, null);
+        return new static($invokableInst, $validatorInst);
     }
 
     /**
@@ -124,21 +124,6 @@ public function disableSilencerRestoration() : CallSilencerInterface
     public function setInvokable(\Closure $invokableInst = null, $invokableBind = null) : CallSilencerInterface
     {
         $this->invokableInst = $invokableInst;
-        $this->setInvokableBind($invokableBind);
-
-        return $this;
-    }
-
-    /**
-     * Assign an alternate binding context/scope for main invokable closure. By default it is not re-bound
-     * and will have the context/scope of the object it was originally defined in.
-     *
-     * @param null|object $invokableBind Bind to apply to main invokable closure
-     *
-     * @return CallSilencerInterface
-     */
-    public function setInvokableBind($invokableBind = null) : CallSilencerInterface
-    {
         $this->invokableBind = $invokableBind ?: $this->invokableBind;
 
         return $this;
@@ -156,22 +141,6 @@ public function setInvokableBind($invokableBind = null) : CallSilencerInterface
     public function setValidator(\Closure $validatorInst = null, $validatorBind = null) : CallSilencerInterface
     {
         $this->validatorInst = $validatorInst;
-        $this->setValidatorBind($validatorBind);
-
-        return $this;
-    }
-
-    /**
-     * Assign an alternate binding context/scope for validation closure. By default it is bound
-     * to the silencer instance itself, allowing it to access the array of helper methods regarding
-     * return values and errors.
-     *
-     * @param null|object $validatorBind Bind to apply to result validation closure
-     *
-     * @return CallSilencerInterface
-     */
-    public function setValidatorBind($validatorBind = null) : CallSilencerInterface
-    {
         $this->validatorBind = $validatorBind ?: $this->validatorBind;
 
         return $this;

diff --git a/lib/CallSilencerInterface.php b/lib/CallSilencerInterface.php
@@ -20,11 +20,11 @@ interface CallSilencerInterface
      * Constructor allows for setting main closure or validation closure.
      *
      * @param \Closure|null $invokableInst Main invokable called in an error-silenced environment
-     * @param object        $invokableBind Binding for main invokable closure call
      * @param \Closure|null $validatorInst Validation checker that determines return value validity
+     * @param object        $invokableBind Binding for main invokable closure call
      * @param object        $validatorBind Binding for result validation closure
      */
-    public function __construct(\Closure $invokableInst = null, $invokableBind = null, \Closure $validatorInst = null, $validatorBind = self::class);
+    public function __construct(\Closure $invokableInst = null, \Closure $validatorInst = null, $invokableBind = null, $validatorBind = self::class);
 
     /**
      * Static method constructs method using same options as main constructor.
@@ -52,16 +52,6 @@ public function disableSilencerRestoration() : CallSilencerInterface;
      */
     public function setInvokable(\Closure $invokableInst = null) : CallSilencerInterface;
 
-    /**
-     * Assign an alternate binding context/scope for main invokable closure. By default it is not re-bound
-     * and will have the context/scope of the object it was originally defined in.
-     *
-     * @param null|object $invokableBind Bind to apply to main invokable closure
-     *
-     * @return CallSilencerInterface
-     */
-    public function setInvokableBind($invokableBind = null) : CallSilencerInterface;
-
     /**
      * Assigns a \Closure instance used to determine return value validity. It is passed the return value and the php
      * error array (or null if non exists) as its only parameters.
@@ -72,17 +62,6 @@ public function setInvokableBind($invokableBind = null) : CallSilencerInterface;
      */
     public function setValidator(\Closure $validatorInst = null) : CallSilencerInterface;
 
-    /**
-     * Assign an alternate binding context/scope for validation closure. By default it is bound
-     * to the silencer instance itself, allowing it to access the array of helper methods regarding
-     * return values and errors.
-     *
-     * @param null|object $validatorBind Bind to apply to result validation closure
-     *
-     * @return CallSilencerInterface
-     */
-    public function setValidatorBind($validatorBind = null) : CallSilencerInterface;
-
     /**
      * Invoke the closure within a silenced environment.
      *