Merge branch 'hotfix/93'

Close #93
Fixes #24

Author: weierophinney

CHANGELOG.md

@@ -24,6 +24,9 @@ All notable changes to this project will be documented in this file, in reverse
 - [#96](https://github.com/zendframework/zend-mvc/pull/96) fixes shared event
   detachment/attachment within the `Forward` plugin to work with both v2 and v3
   of zend-eventmanager.
+- [#93](https://github.com/zendframework/zend-mvc/pull/93) ensures that the
+  Console `Catchall` route factory will not fail when the `defaults` `$options`
+  array key is missing.
 
 ## 2.7.1 - 2016-03-02
 

src/Router/Console/Catchall.php

@@ -85,7 +85,7 @@ public function __construct(array $defaults = [])
      */
     public static function factory($options = [])
     {
-        return new static($options['defaults']);
+        return new static(isset($options['defaults']) ? $options['defaults'] : []);
     }
 
     /**

test/Router/Console/CatchallTest.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Mvc\Router\Console;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Mvc\Router\Console\Catchall;
+
+class CatchallTest extends TestCase
+{
+    public function provideFactoryOptions()
+    {
+        return [
+            [[]],
+            [['defaults' => []]]
+        ];
+    }
+
+    /**
+     * @dataProvider provideFactoryOptions
+     */
+    public function testFactoryReturnsInstanceForAnyOptionsArray($options)
+    {
+        $this->assertInstanceOf(Catchall::class, Catchall::factory($options));
+    }
+}