Merge branch 'feature/36' into develop

Close #36

CHANGELOG.md

@@ -35,7 +35,11 @@ errors. Starting with 1.2.0, they now raise a `RuntimeException`.
 
 ### Added
 
-- Nothing.
+- [#36](https://github.com/zendframework/zend-stratigility/pull/36) adds a new
+  `InvalidMiddlewareException`, with the static factory `fromValue()` that
+  provides an exception message detailing the invalid type. `MiddlewarePipe` now
+  throws this exception from the `pipe()` method when a non-callable value is
+  provided.
 
 ### Deprecated
 

src/Exception/InvalidMiddlewareException.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-stratigility for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-stratigility/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Stratigility\Exception;
+
+use InvalidArgumentException;
+
+class InvalidMiddlewareException extends InvalidArgumentException
+{
+    /**
+     * Create and return an InvalidArgumentException detailing the invalid middleware type.
+     *
+     * @param mixed $value
+     * @return InvalidArgumentException
+     */
+    public static function fromValue($value)
+    {
+        $received = gettype($value);
+
+        if (is_object($value)) {
+            $received = get_class($value);
+        }
+
+        return new self(
+            sprintf(
+                'Middleware must be callable, %s found',
+                $received
+            )
+        );
+    }
+}

src/MiddlewarePipe.php

@@ -9,7 +9,7 @@
 
 namespace Zend\Stratigility;
 
-use InvalidArgumentException;
+use Zend\Stratigility\Exception\InvalidMiddlewareException;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Message\ResponseInterface as Response;
 use SplQueue;
@@ -108,7 +108,7 @@ public function pipe($path, $middleware = null)
 
         // Ensure we have a valid handler
         if (! is_callable($middleware)) {
-            throw new InvalidArgumentException('Middleware must be callable');
+            throw InvalidMiddlewareException::fromValue($middleware);
         }
 
         $this->pipeline->enqueue(new Route(

test/Exception/InvalidMiddlewareExceptionTest.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       http://github.com/zendframework/zend-stratigility for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-stratigility/blob/master/LICENSE.md New BSD License
+ */
+
+namespace ZendTest\Stratigility\Exception;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Stratigility\Exception\InvalidMiddlewareException;
+
+class InvalidMiddlewareExceptionTest extends TestCase
+{
+    public function invalidMiddlewareValues()
+    {
+        return [
+            'null'         => [null, 'NULL'],
+            'true'         => [true, 'boolean'],
+            'false'        => [false, 'boolean'],
+            'empty-string' => ['', 'string'],
+            'string'       => ['not-callable', 'string'],
+            'int'          => [1, 'integer'],
+            'float'        => [1.1, 'double'],
+            'array'        => [['not', 'callable'], 'array'],
+            'object'       => [(object) ['not', 'callable'], 'stdClass'],
+        ];
+    }
+
+    /**
+     * @dataProvider invalidMiddlewareValues
+     */
+    public function testFromValueProvidesNewExceptionWithMessageRelatedToValue($value, $expected)
+    {
+        $e = InvalidMiddlewareException::fromValue($value);
+        $this->assertEquals(sprintf(
+            'Middleware must be callable, %s found',
+            $expected
+        ), $e->getMessage());
+    }
+}