Ensure dependencies are correct

- Added zendframework/zend-expressive-router (as it's required for URI
  generation)
- Updated zendframework/zend-expressive-template to `^1.0.1`, as that's
  the first version supporting the `RenderingException`.
- Added zendframework/zend-diactoros as a dev dependency
- Added zendframework/zend-expressive as a dev/suggest dependency

Author: weierophinney

composer.json

@@ -19,15 +19,19 @@
     "require": {
         "php": ">=5.5",
         "container-interop/container-interop": "^1.1",
-        "zendframework/zend-expressive-template": "^1.0",
+        "psr/http-message": "^1.0",
+        "zendframework/zend-expressive-router": "^1.0",
+        "zendframework/zend-expressive-template": "^1.0.1",
         "zendframework/zend-filter": "^2.5",
         "zendframework/zend-i18n": "^2.5",
         "zendframework/zend-servicemanager": "^2.5",
         "zendframework/zend-view": "^2.5"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.7",
-        "squizlabs/php_codesniffer": "^2.3"
+        "squizlabs/php_codesniffer": "^2.3",
+        "zendframework/zend-diactoros": "^1.2",
+        "zendframework/zend-expressive": "~1.0.0-dev@dev"
     },
     "autoload": {
       "psr-4": {
@@ -41,6 +45,7 @@
     },
     "suggest": {
         "mouf/pimple-interop": "^1.0 to use Pimple for dependency injection",
-        "aura/di": "3.0.*@beta to make use of Aura.Di dependency injection container"
+        "aura/di": "3.0.*@beta to make use of Aura.Di dependency injection container",
+        "zendframework/zend-expressive": "^1.0 if you wish to use the ApplicationUrlDelegatorFactory"
     }
 }

src/UrlHelper.php

@@ -7,10 +7,11 @@
 
 namespace Zend\Expressive\ZendView;
 
-use Zend\Expressive\Exception;
+use Zend\Expressive\Router\Exception\RuntimeException;
 use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\Router\RouteResult;
 use Zend\Expressive\Router\RouteResultObserverInterface;
+use Zend\Expressive\Template\Exception\RenderingException;
 use Zend\View\Helper\AbstractHelper;
 
 class UrlHelper extends AbstractHelper implements RouteResultObserverInterface
@@ -37,17 +38,16 @@ public function __construct(RouterInterface $router)
      * @param string $route
      * @param array $params
      * @return string
-     * @throws Exception\RenderingException if no route provided, and no result
-     *     match present.
-     * @throws Exception\RenderingException if no route provided, and result
-     *     match is a routing failure.
-     * @throws Exception\RuntimeException if router cannot generate URI for
-     *     given route.
+     * @throws RenderingException if no route provided, and no result match
+     *     present.
+     * @throws RenderingException if no route provided, and result match is a
+     *     routing failure.
+     * @throws RuntimeException if router cannot generate URI for given route.
      */
     public function __invoke($route = null, $params = [])
     {
         if ($route === null && $this->result === null) {
-            throw new Exception\RenderingException(
+            throw new RenderingException(
                 'Attempting to use matched result when none was injected; aborting'
             );
         }
@@ -82,13 +82,12 @@ public function setRouteResult(RouteResult $result)
     /**
      * @param array $params
      * @return string
-     * @throws Exception\RenderingException if current result is a routing
-     *     failure.
+     * @throws RenderingException if current result is a routing failure.
      */
     private function generateUriFromResult(array $params)
     {
         if ($this->result->isFailure()) {
-            throw new Exception\RenderingException(
+            throw new RenderingException(
                 'Attempting to use matched result when routing failed; aborting'
             );
         }

src/ZendViewRenderer.php

@@ -9,9 +9,9 @@
 
 namespace Zend\Expressive\ZendView;
 
-use Zend\Expressive\Exception;
 use Zend\Expressive\Template\ArrayParametersTrait;
 use Zend\Expressive\Template\DefaultParamsTrait;
+use Zend\Expressive\Template\Exception;
 use Zend\Expressive\Template\TemplatePath;
 use Zend\Expressive\Template\TemplateRendererInterface;
 use Zend\View\Model\ModelInterface;

test/UrlHelperTest.php

@@ -11,10 +11,11 @@
 
 use ArrayObject;
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Expressive\Exception;
+use Zend\Expressive\Router\Exception\RuntimeException;
 use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\Router\RouteResult;
 use Zend\Expressive\Router\RouteResultObserverInterface;
+use Zend\Expressive\Template\Exception;
 use Zend\Expressive\ZendView\UrlHelper;
 
 class UrlHelperTest extends TestCase
@@ -48,9 +49,9 @@ public function testRaisesExceptionOnInvocationIfNoRouteProvidedAndResultIndicat
 
     public function testRaisesExceptionOnInvocationIfRouterCannotGenerateUriForRouteProvided()
     {
-        $this->router->generateUri('foo', [])->willThrow(Exception\RuntimeException::class);
+        $this->router->generateUri('foo', [])->willThrow(RuntimeException::class);
         $helper = $this->createHelper();
-        $this->setExpectedException(Exception\RuntimeException::class);
+        $this->setExpectedException(RuntimeException::class);
         $helper('foo');
     }
 

test/ZendViewRendererTest.php

@@ -11,8 +11,7 @@
 
 use ArrayObject;
 use PHPUnit_Framework_TestCase as TestCase;
-use Zend\Expressive\Exception;
-use Zend\Expressive\Exception\InvalidArgumentException;
+use Zend\Expressive\Template\Exception\InvalidArgumentException;
 use Zend\Expressive\Template\TemplatePath;
 use Zend\Expressive\ZendView\ZendViewRenderer;
 use Zend\View\Model\ViewModel;