Merge branch 'hotfix/10'

Close #10

Author: weierophinney

.travis.yml

@@ -28,8 +28,8 @@ install:
   - composer info -i
 
 script:
-  - ./vendor/bin/phpunit
-  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/phpcs ; fi
+  - composer test
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs ; fi
 
 notifications:
   email: true

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 0.3.0 - TBD
+## 0.3.0 - 2015-12-02
 
 ### Added
 
@@ -37,6 +37,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#6](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/6)
   Merge route result params with those provided
+- [#10](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/10)
+  updates the code to depend on [zendframework/zend-expressive-template](https://github.com/zendframework/zend-expressive-template)
+  and [zendframework/zend-expressive-router](https://github.com/zendframework/zend-expressive-router)
+  instead of zendframework/zend-expressive.
 
 ## 0.2.0 - 2015-10-20
 

CONTRIBUTING.md

@@ -54,13 +54,13 @@ To run tests:
 
   If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/
 
-- Run the tests via `phpunit` and the provided PHPUnit config, like in this example:
+- Run the tests using the "test" command shipped in the `composer.json`:
 
   ```console
-  $ ./vendor/bin/phpunit
+  $ composer test
   ```
 
-You can turn on conditional tests with the phpunit.xml file.
+You can turn on conditional tests with the `phpunit.xml` file.
 To do so:
 
  -  Copy `phpunit.xml.dist` file to `phpunit.xml`
@@ -69,24 +69,23 @@ To do so:
 
 ## Running Coding Standards Checks
 
-This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding
-standards checks, and provides configuration for our selected checks.
-`phpcs` is installed by default via Composer.
+First, ensure you've installed dependencies via composer, per the previous
+section on running tests.
 
-To run checks only:
+To run CS checks only:
 
 ```console
-$ ./vendor/bin/phpcs
+$ composer cs
 ```
 
-`phpcs` also includes a tool for fixing most CS violations, `phpcbf`:
+To attempt to automatically fix common CS issues:
 
 
 ```console
-$ ./vendor/bin/phpcbf
+$ composer cs-fix
 ```
 
-If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure
+If the above fixes any CS issues, please re-run the tests to ensure
 they pass, and make sure you add and commit the changes after verification.
 
 ## Recommended Workflow for Contributions
@@ -219,3 +218,4 @@ repository, we suggest doing some cleanup of these branches.
    ```console
    $ git push {username} :<branchname>
    ```
+

composer.json

@@ -19,15 +19,19 @@
     "require": {
         "php": ">=5.5",
         "container-interop/container-interop": "^1.1",
-        "zendframework/zend-expressive": "~1.0.0-dev@dev",
+        "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,16 @@
     },
     "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"
+    },
+    "scripts": {
+        "check": [
+            "@cs",
+            "@test"
+        ],
+        "cs": "phpcs",
+        "cs-fix": "phpcbf",
+        "test": "phpunit"
     }
 }

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;