Rename InvalidReturnException to InvalidConditionException. Address style violations.

Author: Mark Challoner

src/InvalidReturnException.php renamed to src/InvalidConditionException.php

@@ -4,7 +4,7 @@
 /**
  * The exception that is thrown when an invalid return value from a callback is specified.
  */
-class InvalidReturnException extends \RuntimeException
+class InvalidConditionException extends \RuntimeException
 {
     // Intentionally empty.
 }

src/Strategy/IfElse.php

@@ -1,7 +1,7 @@
 <?php
 namespace ScriptFUSION\Mapper\Strategy;
 
-use ScriptFUSION\Mapper\InvalidReturnException;
+use ScriptFUSION\Mapper\InvalidConditionException;
 use ScriptFUSION\Mapper\Mapping;
 
 /**
@@ -38,7 +38,7 @@ public function __construct(callable $condition, $if, $else = null)
      * @param mixed $data
      * @param mixed $context
      *
-     * @throws InvalidReturnException
+     * @throws InvalidConditionException
      *
      * @return mixed
      */
@@ -47,7 +47,7 @@ public function __invoke($data, $context = null)
         $return = call_user_func($this->condition, $data, $context);
 
         if (!is_bool($return)) {
-            throw new InvalidReturnException('Invalid return from condition: must be of type boolean.');
+            throw new InvalidConditionException('Invalid return from condition: must be of type boolean.');
         }
 
         if ($return === true) {

test/Functional/DocumentationTest.php

@@ -236,6 +236,7 @@ function ($data) {
                                 return false;
                             }
                         }
+
                         return true;
                     },
                     true,
@@ -254,6 +255,7 @@ function ($data) {
                                 return false;
                             }
                         }
+
                         return true;
                     },
                     true,

test/Integration/Mapper/Strategy/IfElseTest.php

@@ -2,11 +2,9 @@
 namespace ScriptFUSIONTest\Integration\Mapper\Strategy;
 
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
-use ScriptFUSION\Mapper\InvalidReturnException;
+use ScriptFUSION\Mapper\InvalidConditionException;
 use ScriptFUSION\Mapper\Mapper;
-use ScriptFUSION\Mapper\Strategy\Exists;
 use ScriptFUSION\Mapper\Strategy\IfElse;
-use ScriptFUSION\Mapper\Strategy\Strategy;
 
 final class IfElseTest extends \PHPUnit_Framework_TestCase
 {
@@ -16,7 +14,7 @@ final class IfElseTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $this->condition = function($data) {
+        $this->condition = function ($data) {
             return array_key_exists('baz', $data) && $data['baz'] === 'qux';
         };
     }
@@ -41,7 +39,7 @@ public function testOnlyIf()
 
     public function testStrictness()
     {
-        $this->setExpectedException(InvalidReturnException::class);
+        $this->setExpectedException(InvalidConditionException::class);
 
         $ifElse = (new IfElse(
             function () {