From d1a6773295a0aaf1b921d8ae3024394ce8225b69 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Wed, 2 Dec 2015 10:50:58 -0600
Subject: [PATCH] Create subcomponent-specific exceptions for Template
 subcomponent

In preparation for splitting the Template subcomponent into its own repository,
this patch:

- adds an `Exception` subcomponent, with an `ExceptionInterface` marker
  interface and an `InvalidArgumentException` concrete implementation.
- updates the ArrayParametersTrait and DefaultParamsTrait to use the
  subcomponent-specific exceptions.
- updates the ArrayParametersTrait to test for the subcomponent-specific
  exceptions instead of the component-level exceptions.
---
 src/Template/ArrayParametersTrait.php              |  1 -
 src/Template/DefaultParamsTrait.php                |  1 -
 src/Template/Exception/ExceptionInterface.php      | 14 ++++++++++++++
 .../Exception/InvalidArgumentException.php         | 14 ++++++++++++++
 test/Template/ArrayParametersTraitTest.php         |  2 +-
 5 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 src/Template/Exception/ExceptionInterface.php
 create mode 100644 src/Template/Exception/InvalidArgumentException.php

diff --git a/src/Template/ArrayParametersTrait.php b/src/Template/ArrayParametersTrait.php
index 2a25046b..1a04c85c 100644
--- a/src/Template/ArrayParametersTrait.php
+++ b/src/Template/ArrayParametersTrait.php
@@ -10,7 +10,6 @@
 namespace Zend\Expressive\Template;
 
 use Traversable;
-use Zend\Expressive\Exception;
 
 trait ArrayParametersTrait
 {
diff --git a/src/Template/DefaultParamsTrait.php b/src/Template/DefaultParamsTrait.php
index d0c08a0d..1973629f 100644
--- a/src/Template/DefaultParamsTrait.php
+++ b/src/Template/DefaultParamsTrait.php
@@ -10,7 +10,6 @@
 namespace Zend\Expressive\Template;
 
 use Traversable;
-use Zend\Expressive\Exception;
 use Zend\Stdlib\ArrayUtils;
 
 trait DefaultParamsTrait
diff --git a/src/Template/Exception/ExceptionInterface.php b/src/Template/Exception/ExceptionInterface.php
new file mode 100644
index 00000000..518fa664
--- /dev/null
+++ b/src/Template/Exception/ExceptionInterface.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Expressive\Template\Exception;
+
+interface ExceptionInterface
+{
+}
diff --git a/src/Template/Exception/InvalidArgumentException.php b/src/Template/Exception/InvalidArgumentException.php
new file mode 100644
index 00000000..93559b0f
--- /dev/null
+++ b/src/Template/Exception/InvalidArgumentException.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
+ * @copyright Copyright (c) 2015 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
+ */
+
+namespace Zend\Expressive\Template\Exception;
+
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
+{
+}
diff --git a/test/Template/ArrayParametersTraitTest.php b/test/Template/ArrayParametersTraitTest.php
index 2f1cfb6c..bd5fda70 100644
--- a/test/Template/ArrayParametersTraitTest.php
+++ b/test/Template/ArrayParametersTraitTest.php
@@ -9,7 +9,7 @@
 use ArrayIterator;
 use PHPUnit_Framework_TestCase as TestCase;
 use stdClass;
-use Zend\Expressive\Exception\InvalidArgumentException;
+use Zend\Expressive\Template\Exception\InvalidArgumentException;
 
 class ArrayParametersTraitTest extends TestCase
 {