Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit 0cfefcb

Browse files
authored
Merge pull request #2 from boesing/feature/zend-view
2 parents 6731735 + 0cceaf8 commit 0cfefcb

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

src/LaminasModuleProvider.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
use Laminas\ModuleManager\Feature\SerializerProviderInterface;
2222
use Laminas\ModuleManager\Feature\ServiceProviderInterface;
2323
use Laminas\ModuleManager\Feature\ValidatorProviderInterface;
24+
use Laminas\ModuleManager\Feature\ViewHelperProviderInterface;
2425
use Traversable;
2526

2627
/**
@@ -62,6 +63,7 @@ public function __invoke() : array
6263
'hydrators' => $this->getHydratorConfig(),
6364
'input_filters' => $this->getInputFilterConfig(),
6465
'serializers' => $this->getSerializerConfig(),
66+
'view_helpers' => $this->getViewHelperConfig(),
6567
]));
6668
}
6769

@@ -177,7 +179,7 @@ public function getHydratorConfig() : array
177179
return $this->convert($this->module->getHydratorConfig());
178180
}
179181

180-
public function getInputFilterConfig()
182+
public function getInputFilterConfig() /* : array */
181183
{
182184
if (! $this->module instanceof InputFilterProviderInterface) {
183185
return [];
@@ -194,4 +196,13 @@ public function getSerializerConfig() : array
194196

195197
return $this->convert($this->module->getSerializerConfig());
196198
}
199+
200+
public function getViewHelperConfig() : array
201+
{
202+
if (! $this->module instanceof ViewHelperProviderInterface) {
203+
return [];
204+
}
205+
206+
return $this->convert($this->module->getViewHelperConfig());
207+
}
197208
}

test/LaminasModuleProviderTest.php

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
use Laminas\ModuleManager\Feature\RouteProviderInterface;
2020
use Laminas\ModuleManager\Feature\SerializerProviderInterface;
2121
use Laminas\ModuleManager\Feature\ValidatorProviderInterface;
22+
use Laminas\ModuleManager\Feature\ViewHelperProviderInterface;
2223
use LaminasTest\ConfigAggregatorModuleManager\Resources\LaminasModule;
2324
use LaminasTest\ConfigAggregatorModuleManager\Resources\LaminasModuleWithInvalidConfiguration;
2425
use LaminasTest\ConfigAggregatorModuleManager\Resources\LaminasModuleWithLaminasConfig;
@@ -148,6 +149,21 @@ public function testCanProvideSerializersFromSerializerProviderInterface()
148149
$this->assertSame($this->createServiceManagerConfiguration(), $config['serializers']);
149150
}
150151

152+
public function testCanProviderViewHelpersFromViewHelperProviderInterface()
153+
{
154+
$module = $this->createMock(ViewHelperProviderInterface::class);
155+
$module
156+
->expects($this->once())
157+
->method('getViewHelperConfig')
158+
->willReturn($this->createServiceManagerConfiguration());
159+
160+
$provider = new LaminasModuleProvider($module);
161+
162+
$config = $provider();
163+
$this->assertArrayHasKey('view_helpers', $config);
164+
$this->assertSame($this->createServiceManagerConfiguration(), $config['view_helpers']);
165+
}
166+
151167
public function testCanProvideAnyConfigValue()
152168
{
153169
$module = new LaminasModule();
@@ -191,7 +207,7 @@ public function testCanHandleModulesWithTraversableConfiguration()
191207
$this->assertSame($this->createServiceManagerConfiguration(), $config['dependencies']);
192208
}
193209

194-
public function testCanHandleModuelsWithLaminasConfigConfiguration()
210+
public function testCanHandleModulesWithLaminasConfigConfiguration()
195211
{
196212
$module = new LaminasModuleWithTraversableConfig();
197213
$provider = new LaminasModuleProvider($module);

0 commit comments

Comments
 (0)