Merge branch 'feature/67' into develop

Close #67

Author: Xerkus

CHANGELOG.md

@@ -10,11 +10,15 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Changed
 
-- Nothing.
+- [#67](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/67)
+  changes configuration option for default template suffix used by NamespacedPathStackResolver
+  to `$config['templates']['extension']` to match other template renderers provided
+  by framework. Default value is `phtml`
 
 ### Deprecated
 
-- Nothing.
+- [#67](https://github.com/zendframework/zend-expressive-zendviewrenderer/pull/67)
+  deprecates configuration option `$config['templates']['default_suffix']`
 
 ### Removed
 

src/ConfigProvider.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-zendviewrenderer for the canonical source repository
- * @copyright Copyright (c) 2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2017-2019 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-zendviewrenderer/blob/master/LICENSE.md New BSD License
  */
 
@@ -38,7 +38,7 @@ public function getDependencies() : array
     public function getTemplates() : array
     {
         return [
-            'default_suffix' => 'phtml',
+            'extension' => 'phtml',
             'layout' => 'layout::default',
             'paths' => [],
         ];

src/ZendViewRendererFactory.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-zendviewrenderer for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2015-2019 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-zendviewrenderer/blob/master/LICENSE.md New BSD License
  */
 
@@ -60,6 +60,7 @@ public function __invoke(ContainerInterface $container) : ZendViewRenderer
         $config   = $container->has('config') ? $container->get('config') : [];
         $config   = $config['templates'] ?? [];
 
+
         // Configuration
         $resolver = new Resolver\AggregateResolver();
         $resolver->attach(
@@ -76,8 +77,9 @@ public function __invoke(ContainerInterface $container) : ZendViewRenderer
         // Inject helpers
         $this->injectHelpers($renderer, $container);
 
+        $defaultSuffix = $config['extension'] ?? $config['default_suffix'] ?? null;
         // Inject renderer
-        $view = new ZendViewRenderer($renderer, $config['layout'] ?? null, $config['default_suffix'] ?? null);
+        $view = new ZendViewRenderer($renderer, $config['layout'] ?? null, $defaultSuffix);
 
         // Add template paths
         $allPaths = isset($config['paths']) && is_array($config['paths']) ? $config['paths'] : [];

test/ZendViewRendererFactoryTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
  * @see       https://github.com/zendframework/zend-expressive-zendviewrenderer for the canonical source repository
- * @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (https://www.zend.com)
+ * @copyright Copyright (c) 2015-2019 Zend Technologies USA Inc. (https://www.zend.com)
  * @license   https://github.com/zendframework/zend-expressive-zendviewrenderer/blob/master/LICENSE.md New BSD License
  */
 
@@ -253,6 +253,34 @@ public function testConfiguresTemplateMap()
     }
 
     public function testConfiguresCustomDefaultSuffix()
+    {
+        $config = [
+            'templates' => [
+                'extension' => 'php',
+            ],
+        ];
+
+        $this->container->has('config')->willReturn(true);
+        $this->container->get('config')->willReturn($config);
+        $this->container->has(HelperPluginManager::class)->willReturn(false);
+        $this->container->has(PhpRenderer::class)->willReturn(false);
+
+        $factory = new ZendViewRendererFactory();
+        $view = $factory($this->container->reveal());
+
+        $r = new ReflectionProperty($view, 'resolver');
+        $r->setAccessible(true);
+        $resolver  = $r->getValue($view);
+
+        $this->assertInstanceOf(
+            NamespacedPathStackResolver::class,
+            $resolver,
+            'Expected NamespacedPathStackResolver not found!'
+        );
+        $this->assertEquals('php', $resolver->getDefaultSuffix());
+    }
+
+    public function testConfiguresDeprecatedDefaultSuffix()
     {
         $config = [
             'templates' => [