Skip to content
This repository was archived by the owner on Jan 21, 2020. It is now read-only.

Commit eb71018

Browse files
committed
Fix template renderer factory
1 parent 37a6507 commit eb71018

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

src/ZendViewRendererFactory.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* @see https://github.com/zendframework/zend-expressive-zendviewrenderer for the canonical source repository
4-
* @copyright Copyright (c) 2015-2017 Zend Technologies USA Inc. (https://www.zend.com)
4+
* @copyright Copyright (c) 2015-2019 Zend Technologies USA Inc. (https://www.zend.com)
55
* @license https://github.com/zendframework/zend-expressive-zendviewrenderer/blob/master/LICENSE.md New BSD License
66
*/
77

@@ -67,6 +67,16 @@ public function __invoke(ContainerInterface $container) : ZendViewRenderer
6767
100
6868
);
6969

70+
$nsPathResolver = new NamespacedPathStackResolver();
71+
// Set default suffix
72+
if (isset($config['default_suffix'])) {
73+
$nsPathResolver->setDefaultSuffix($config['default_suffix']);
74+
}
75+
$resolver->attach(
76+
$nsPathResolver,
77+
0
78+
);
79+
7080
// Create or retrieve the renderer from the container
7181
$renderer = $container->has(PhpRenderer::class)
7282
? $container->get(PhpRenderer::class)
@@ -77,7 +87,7 @@ public function __invoke(ContainerInterface $container) : ZendViewRenderer
7787
$this->injectHelpers($renderer, $container);
7888

7989
// Inject renderer
80-
$view = new ZendViewRenderer($renderer, $config['layout'] ?? null, $config['default_suffix'] ?? null);
90+
$view = new ZendViewRenderer($renderer, $nsPathResolver, $config['layout'] ?? null);
8191

8292
// Add template paths
8393
$allPaths = isset($config['paths']) && is_array($config['paths']) ? $config['paths'] : [];

0 commit comments

Comments
 (0)