Merge branch 'hotfix/574-psr-11-exceptions' into release-3.0.0

Close #574
Fixes #573

Author: weierophinney

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 3.0.0rc1 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#574](https://github.com/zendframework/zend-expressive/pull/574) updates the
+  classes `Zend\Expressive\Exception\InvalidMiddlewareException` and
+  `MissingDependencyException` to implement the
+  [PSR-11](https://www.php-fig.org/psr/psr-11/) `ContainerExceptionInterface`.
+
 ## 3.0.0alpha9 - 2018-02-22
 
 ### Added

src/Exception/InvalidMiddlewareException.php

@@ -9,11 +9,14 @@
 
 namespace Zend\Expressive\Exception;
 
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use RuntimeException;
 
-class InvalidMiddlewareException extends RuntimeException implements ExceptionInterface
+class InvalidMiddlewareException extends RuntimeException implements
+    ContainerExceptionInterface,
+    ExceptionInterface
 {
     /**
      * @param mixed $middleware The middleware that does not fulfill the

src/Exception/MissingDependencyException.php

@@ -9,9 +9,12 @@
 
 namespace Zend\Expressive\Exception;
 
+use Psr\Container\ContainerExceptionInterface;
 use RuntimeException;
 
-class MissingDependencyException extends RuntimeException implements ExceptionInterface
+class MissingDependencyException extends RuntimeException implements
+    ContainerExceptionInterface,
+    ExceptionInterface
 {
     public static function forMiddlewareService(string $service) : self
     {

src/MiddlewareContainer.php

@@ -29,7 +29,8 @@ public function __construct(ContainerInterface $container)
     /**
      * Returns true if the service is in the container, or resolves to an
      * autoloadable class name.
-     * {@inheritDocs}
+     *
+     * @param string $service
      */
     public function has($service) : bool
     {
@@ -43,9 +44,12 @@ public function has($service) : bool
     /**
      * Returns middleware pulled from container, or directly instantiated if
      * not managed by the container.
-     * {@inheritDocs}
+     *
+     * @param string $service
      * @throws Exception\MissingDependencyException if the service does not
      *     exist, or is not a valid class name.
+     * @throws Exception\InvalidMiddlewareException if the service is not
+     *     an instance of MiddlewareInterface.
      */
     public function get($service) : MiddlewareInterface
     {

test/ExceptionTest.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * @see       https://github.com/zendframework/zend-expressive for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (https://www.zend.com)
+ * @license   https://github.com/zendframework/zend-expressive/blob/master/LICENSE.md New BSD License
+ */
+
+declare(strict_types=1);
+
+namespace ZendTest\Expressive;
+
+use Generator;
+use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerExceptionInterface;
+use Zend\Expressive\Exception\ExceptionInterface;
+use Zend\Expressive\Exception\InvalidMiddlewareException;
+use Zend\Expressive\Exception\MissingDependencyException;
+
+class ExceptionTest extends TestCase
+{
+    public function exception() : Generator
+    {
+        $namespace = substr(ExceptionInterface::class, 0, strrpos(ExceptionInterface::class, '\\') + 1);
+
+        $exceptions = glob(__DIR__ . '/../src/Exception/*.php');
+        foreach ($exceptions as $exception) {
+            $class = substr(basename($exception), 0, -4);
+
+            yield $class => [$namespace . $class];
+        }
+    }
+
+    /**
+     * @dataProvider exception
+     */
+    public function testExceptionIsInstanceOfExceptionInterface(string $exception) : void
+    {
+        $this->assertContains('Exception', $exception);
+        $this->assertTrue(is_a($exception, ExceptionInterface::class, true));
+    }
+
+    public function containerException() : Generator
+    {
+        yield InvalidMiddlewareException::class => [InvalidMiddlewareException::class];
+        yield MissingDependencyException::class => [MissingDependencyException::class];
+    }
+
+    /**
+     * @dataProvider containerException
+     */
+    public function testExceptionIsInstanceOfContainerExceptionInterface(string $exception) : void
+    {
+        $this->assertTrue(is_a($exception, ContainerExceptionInterface::class, true));
+    }
+}