Merge pull request #41 from mlopes/feature/Skip-3.2-matchers-on-older-versions-of-phpspec

Skip phpspec 3.2 matchers if they don't exist

Author: Sam-Burns

README.md

@@ -6,13 +6,18 @@ phpspec2-expect
 Installation
 ============
 
-Add `"bossa/phpspec2-expect": "*"` to `composer.json`
+Install it using the `composer require` command:
+
+```bash
+   composer require --dev bossa/phpspec2-expect
+```
+
+Alternativelly you can add it to the `composer.json` file
 
 ```json
 {
     "require-dev": {
-         "phpspec/phpspec": "dev-master",
-         "bossa/phpspec2-expect": "*"
+         "bossa/phpspec2-expect": "^2.2"
     },
     "config": {
         "bin-dir": "bin"

composer.json

@@ -16,7 +16,7 @@
         }
     },
     "require": {
-        "phpspec/phpspec": "~3.2 <3.3.0"
+        "phpspec/phpspec": "~3.2 <3.4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.4"

expect.php

@@ -73,9 +73,15 @@ function expect($sus)
         $matchers->add(new StringEndMatcher($presenter));
         $matchers->add(new StringRegexMatcher($presenter));
         $matchers->add(new StringContainMatcher($presenter));
-        $matchers->add(new TriggerMatcher($unwrapper));
-        $matchers->add(new IterateAsMatcher($presenter));
-        $matchers->add(new ApproximatelyMatcher($presenter));
+        if (class_exists('TriggerMatcher')) {
+            $matchers->add(new TriggerMatcher($unwrapper));
+        }
+        if (class_exists('IterateAsMatcher')) {
+            $matchers->add(new IterateAsMatcher($presenter));
+        }
+        if (class_exists('ApproximatelyMatcher')) {
+            $matchers->add(new ApproximatelyMatcher($presenter));
+        }
 
         $trace = debug_backtrace();
         if (isset($trace[1]['object'])) {

tests/ExpectTest.php

@@ -44,9 +44,9 @@ function correctExpectations()
             [ function () {  expect('foo bar')->toEndWith('bar'); } ],
             [ function () {  expect('foo bar')->toMatch('/bar/'); } ],
             [ function () {  expect((new Foo()))->toThrow('InvalidArgumentException')->duringThrowException(); } ],
-            [ function () {  expect((new Foo()))->toTrigger(E_USER_DEPRECATED)->duringTriggerError(); } ],
-            [ function () {  expect(1.444447777)->toBeApproximately(1.444447777, 1.0e-9); } ],
-            [ function () {  expect((new Foo())->getIterator())->toIterateAs(new \ArrayIterator(['Foo', 'Bar'])); } ],
+            [ function () {  method_exists(expect(''), 'toTrigger') && expect((new Foo()))->toTrigger(E_USER_DEPRECATED)->duringTriggerError(); } ],
+            [ function () {  method_exists(expect(''), 'toBeApproximately') && expect(1.444447777)->toBeApproximately(1.444447777, 1.0e-9); } ],
+            [ function () {  method_exists(expect(''), 'toIterateAs') && expect((new Foo())->getIterator())->toIterateAs(new \ArrayIterator(['Foo', 'Bar'])); } ],
         ];
     }
 
@@ -55,7 +55,7 @@ function correctExpectations()
      */
     function incorrectExpectations()
     {
-        return [
+        $incorrectExpectations = [
             [ function () {  expect(6)->toBe(5); } ],
             [ function () {  expect(6)->toBeLike('5'); } ],
             [ function () {  expect((new Foo()))->toHaveType('Bar'); } ],
@@ -70,9 +70,16 @@ function incorrectExpectations()
             [ function () {  expect('foo bar')->toStartWith('baz'); } ],
             [ function () {  expect('foo bar')->toEndWith('baz'); } ],
             [ function () {  expect('foo bar')->toMatch('/baz/'); } ],
-            [ function () {  expect((new Foo()))->toThrow('AnotherException')->duringThrowException(); } ],
-            [ function () {  expect(1.444447777)->toBeApproximately(1.444447778, 1.0e-9); } ],
-            [ function () {  expect((new Foo())->getIterator())->toIterateAs(new \ArrayIterator(['Bar', 'Foo'])); } ]
+            [ function () {  expect((new Foo()))->toThrow('AnotherException')->duringThrowException(); } ]
         ];
+
+        if (method_exists(expect(''), 'toBeApproximately')) {
+            $incorrectExpectations[] = [function () { expect(1.444447777)->toBeApproximately(1.444447778, 1.0e-9); }];
+        }
+        if (method_exists(expect(''), 'toIterateAs')) {
+            $incorrectExpectations = [ function () { expect((new Foo())->getIterator())->toIterateAs(new \ArrayIterator(['Bar', 'Foo'])); } ];
+        }
+
+        return $incorrectExpectations;
     }
 }