Address CR requests.

Author: Mark Challoner

README.md

@@ -583,7 +583,7 @@ $data = [
 
 Delegates to one expression or another depending on whether the specified condition strictly evaluates to true.
 
-If the condition does not return a boolean an InvalidReturnException will be thrown.
+If the condition does not return a boolean, `InvalidConditionException` is thrown.
 
 #### Signature
 
@@ -592,26 +592,17 @@ IfElse(callable $condition, Strategy|Mapping|array|mixed $if, Strategy|Mapping|a
 ```
 
  1. `$condition` – Condition.
- 2. `$if` – Expression used when condition loosely evaluates to true.
- 3. `$else` – Expression used when condition loosely evaluates to false.
+ 2. `$if` – Expression used when condition evaluates to true.
+ 3. `$else` – Expression used when condition evaluates to false.
 
 #### Example
 
-Test if all items in $data are positive.
-
 ```php
-$data = [1, 3, 5, 6];
-
 (new Mapper)->map(
-    $data,
+    ['foo' => 'foo'],
     new IfElse(
         function ($data) {
-            foreach ($data as $datum) {
-                if ($datum <= 0) {
-                    return false;
-                }
-            }
-            return true;
+            return $data['foo'] !== 'bar';
         },
         true,
         false
@@ -621,28 +612,6 @@ $data = [1, 3, 5, 6];
 
 > true
 
-Test if all items in $data are even.
-
-```php
-(new Mapper)->map(
-    $data,
-    new IfElse(
-        function ($data) {
-            foreach ($data as $datum) {
-                if ($datum % 2 === 0) {
-                    return false;
-                }
-            }
-            return true;
-        },
-        true,
-        false
-    )
-);
-```
-
-> false
-
 ### IfExists
 
 Delegates to one expression or another depending on whether the specified condition maps to null.

src/InvalidConditionException.php

@@ -2,7 +2,7 @@
 namespace ScriptFUSION\Mapper;
 
 /**
- * The exception that is thrown when an invalid return value from a callback is specified.
+ * The exception that is thrown when an invalid condition is specified.
  */
 class InvalidConditionException extends \RuntimeException
 {

src/Strategy/IfElse.php

@@ -27,6 +27,7 @@ class IfElse extends Delegate
     public function __construct(callable $condition, $if, $else = null)
     {
         parent::__construct($if);
+
         $this->condition = $condition;
         $this->else = $else;
     }
@@ -44,13 +45,13 @@ public function __construct(callable $condition, $if, $else = null)
      */
     public function __invoke($data, $context = null)
     {
-        $return = call_user_func($this->condition, $data, $context);
+        $result = call_user_func($this->condition, $data, $context);
 
-        if (!is_bool($return)) {
+        if (!is_bool($result)) {
             throw new InvalidConditionException('Invalid return from condition: must be of type boolean.');
         }
 
-        if ($return === true) {
+        if ($result === true) {
             return parent::__invoke($data, $context);
         }
 

src/Strategy/IfExists.php

@@ -21,7 +21,7 @@ class IfExists extends IfElse
     public function __construct(Strategy $condition, $if, $else = null)
     {
         parent::__construct(
-            function ($data, $context = null) use ($condition) {
+            function ($data, $context) use ($condition) {
                 return $this->delegate($condition, $data, $context) !== null;
             },
             $if,

test/Functional/DocumentationTest.php

@@ -224,39 +224,12 @@ public function testFlatten()
 
     public function testIfElse()
     {
-        $data = [1, 3, 5, 6];
-
         self::assertTrue(
             (new Mapper)->map(
-                $data,
-                new IfElse(
-                    function ($data) {
-                        foreach ($data as $datum) {
-                            if ($datum <= 0) {
-                                return false;
-                            }
-                        }
-
-                        return true;
-                    },
-                    true,
-                    false
-                )
-            )
-        );
-
-        self::assertFalse(
-            (new Mapper)->map(
-                $data,
+                ['foo' => 'foo'],
                 new IfElse(
                     function ($data) {
-                        foreach ($data as $datum) {
-                            if ($datum % 2) {
-                                return false;
-                            }
-                        }
-
-                        return true;
+                        return $data['foo'] !== 'bar';
                     },
                     true,
                     false

test/Integration/Mapper/Strategy/IfElseTest.php

@@ -1,15 +1,12 @@
 <?php
 namespace ScriptFUSIONTest\Integration\Mapper\Strategy;
 
-use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use ScriptFUSION\Mapper\InvalidConditionException;
 use ScriptFUSION\Mapper\Mapper;
 use ScriptFUSION\Mapper\Strategy\IfElse;
 
 final class IfElseTest extends \PHPUnit_Framework_TestCase
 {
-    use MockeryPHPUnitIntegration;
-
     private $condition;
 
     public function setUp()