Possible to create matchers accepting more than one argument as actua…

…l values
phpspec · May 15, 2011 · e2f7d1b · e2f7d1b
1 parent c4dec49
commit e2f7d1b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/PHPSpec/Specification.php b/src/PHPSpec/Specification.php
@@ -94,6 +94,13 @@ class Specification
      */
     protected $_matcher = null;
 
+    /**
+     * Whether actual value is a composed value
+     * 
+     * @var boolean
+     */
+    protected $_composedActual = false;
+
     /**
      * Public static factory method to create a new Specification (DSL)
      * object based on the given object or scalar value.
@@ -406,9 +413,11 @@ protected function _createMatcher($method)
      */
     protected function _performMatching()
     {
-        $args = $this->getActualValue();
-        if (!is_array($this->getActualValue())) {
-            $args = array($this->getActualValue());
+        $actual = $this->getActualValue();
+        if (is_array($actual) && $this->_composedActual) {
+            $args = $actual;
+        } else {
+            $args = array($actual);
         }
         $result = call_user_func_array(
             array($this->_matcher, 'matches'), $args

diff --git a/src/PHPSpec/Specification/Closure.php b/src/PHPSpec/Specification/Closure.php
@@ -70,6 +70,7 @@ public function __construct(\Closure $closure = null)
             } catch (\PHPSpec\Exception $e) {
                 throw $e;
             } catch(\Exception $e) {
+                $this->_composedActual = true;
                 $this->setActualValue(array(get_class($e), $e->getMessage()));
             }
         }