Merge branch 'hotfix/111'

Close #111

Author: weierophinney

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.7.5 - TBD
+## 2.7.5 - 2016-04-06
 
 ### Added
 
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#111](https://github.com/zendframework/zend-mvc/pull/111) fixes a bug in how
+  the `ConsoleExceptionStrategyFactory` whereby it was overwriting the default
+  exception message template with an empty string when no configuration for it
+  was provided.
 
 ## 2.7.4 - 2016-04-03
 

src/Service/ConsoleExceptionStrategyFactory.php

@@ -68,7 +68,8 @@ private function injectDisplayExceptions(ExceptionStrategy $strategy, array $con
      */
     private function injectExceptionMessage(ExceptionStrategy $strategy, array $config)
     {
-        $message = isset($config['exception_message']) ? $config['exception_message'] : '';
-        $strategy->setMessage($message);
+        if (isset($config['exception_message'])) {
+            $strategy->setMessage($config['exception_message']);
+        }
     }
 }

test/Service/ConsoleExceptionStrategyFactoryTest.php

@@ -0,0 +1,80 @@
+<?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\Service;
+
+use Interop\Container\ContainerInterface;
+use PHPUnit_Framework_TestCase as TestCase;
+use Zend\Mvc\Service\ConsoleExceptionStrategyFactory;
+use Zend\Mvc\View\Console\ExceptionStrategy;
+
+class ConsoleExceptionStrategyFactoryTest extends TestCase
+{
+    public function createContainer($config = [])
+    {
+        $container = $this->prophesize(ContainerInterface::class);
+        $container->has('config')->willReturn(true);
+        $container->get('config')->willReturn($config);
+        return $container->reveal();
+    }
+
+    public function testReturnsExceptionStrategy()
+    {
+        $factory = new ConsoleExceptionStrategyFactory();
+        $result  = $factory($this->createContainer(), 'ConsoleExceptionStrategy');
+        $this->assertInstanceOf(ExceptionStrategy::class, $result);
+    }
+
+    public function testIfNotSetShouldUseDefaultExceptionMessageTemplate()
+    {
+        $factory = new ConsoleExceptionStrategyFactory();
+        $result  = $factory($this->createContainer(), 'ConsoleExceptionStrategy');
+
+        $strategy = new ExceptionStrategy();
+        $this->assertEquals($strategy->getMessage(), $result->getMessage());
+    }
+
+    public function testExceptionMessageTemplateCanBeChangedInConfig()
+    {
+        $config = [
+            'console' => [
+                'view_manager' => [
+                    'exception_message' => 'Custom template :className :message',
+                ]
+            ]
+        ];
+        $factory = new ConsoleExceptionStrategyFactory();
+        $result  = $factory($this->createContainer($config), 'ConsoleExceptionStrategy');
+
+        $this->assertEquals($config['console']['view_manager']['exception_message'], $result->getMessage());
+    }
+
+    public function testDisplayExceptionsEnabledByDefault()
+    {
+        $factory = new ConsoleExceptionStrategyFactory();
+        $result  = $factory($this->createContainer(), 'ConsoleExceptionStrategy');
+
+        $this->assertTrue($result->displayExceptions(), 'displayExceptions should be enabled by default.');
+    }
+
+    public function testDisplayExceptionsCanBeChangedInConfig()
+    {
+        $config = [
+            'console' => [
+                'view_manager' => [
+                    'display_exceptions' => false,
+                ]
+            ]
+        ];
+        $factory = new ConsoleExceptionStrategyFactory();
+        $result  = $factory($this->createContainer($config), 'ConsoleExceptionStrategy');
+
+        $this->assertFalse($result->displayExceptions(), 'displayExceptions should be disabled in config.');
+    }
+}