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

Commit ceaa530

Browse files
committed
Merge branch 'hotfix/59' into develop
Forward port #59
2 parents caee432 + dc391a4 commit ceaa530

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/HelperPluginManagerFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function __invoke(ContainerInterface $container) : HelperPluginManager
2020
$manager = new HelperPluginManager($container);
2121

2222
$config = $container->has('config') ? $container->get('config') : [];
23-
$config = isset($config['view_helpers']) ? $config['view_helpers'] : [];
23+
$config = $config['view_helpers'] ?? [];
2424

2525
if (! empty($config)) {
2626
(new Config($config))->configureServiceManager($manager);

src/ZendViewRendererFactory.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,17 @@ class ZendViewRendererFactory
5757
public function __invoke(ContainerInterface $container) : ZendViewRenderer
5858
{
5959
$config = $container->has('config') ? $container->get('config') : [];
60-
$config = isset($config['templates']) ? $config['templates'] : [];
60+
$config = $config['templates'] ?? [];
6161

6262
// Configuration
6363
$resolver = new Resolver\AggregateResolver();
6464
$resolver->attach(
65-
new Resolver\TemplateMapResolver(isset($config['map']) ? $config['map'] : []),
65+
new Resolver\TemplateMapResolver($config['map'] ?? []),
6666
100
6767
);
6868

6969
// Create or retrieve the renderer from the container
70-
$renderer = ($container->has(PhpRenderer::class))
70+
$renderer = $container->has(PhpRenderer::class)
7171
? $container->get(PhpRenderer::class)
7272
: new PhpRenderer();
7373
$renderer->setResolver($resolver);
@@ -76,7 +76,7 @@ public function __invoke(ContainerInterface $container) : ZendViewRenderer
7676
$this->injectHelpers($renderer, $container);
7777

7878
// Inject renderer
79-
$view = new ZendViewRenderer($renderer, isset($config['layout']) ? $config['layout'] : null);
79+
$view = new ZendViewRenderer($renderer, $config['layout'] ?? null);
8080

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

0 commit comments

Comments
 (0)