[gh-17] Fixed another PHP 5.3.2 related bug preventing matcher being …

…used as callbacks
phpspec · May 1, 2011 · b6b290c · b6b290c
1 parent 5f15851
commit b6b290c
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/PHPSpec/Specification.php b/src/PHPSpec/Specification.php
@@ -371,15 +371,15 @@ public function setRunner($runner)
      */
     protected function _createMatcher($method)
     {
-        $matcherClass = "\\PHPSpec\\Matcher\\" . ucfirst($method);
+        $matcherClass = ucfirst($method);
         try {
-            if (class_exists($matcherClass, true)) {
-                $this->_matcher = new $matcherClass($this->getExpectedValue());
-            }
-        } catch (\PHPSpec\Exception $e) {
-            $matcherClass = "\\PHPSpec\\Context\\Zend\\Matcher\\" .
-                            ucfirst($method);
-            $this->_matcher = new $matcherClass($this->getExpectedValue());
+            $factory = '$this->_matcher = new \PHPSpec\Matcher\\' .
+                       $matcherClass . '($this->getExpectedValue());';
+            eval($factory);
+        } catch(\PHPSpec\Exception $e) {
+            $factory = '$this->_matcher = new \PHPSpec\Context\Zend\Matcher\\' .
+                       $matcherClass . '($this->getExpectedValue());';
+            eval($factory);
         }
     }