Skip to content

Commit 47d29f5

Browse files
committed
Merge pull request #135 from wshafer/master
Fix to config file for emergency issue #134
2 parents 2f2af67 + c4b86ed commit 47d29f5

File tree

2 files changed

+126
-1
lines changed

2 files changed

+126
-1
lines changed

config/module.config.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@
1010
'AssetManager\Resolver\PathStackResolver' => 'AssetManager\Service\PathStackResolverServiceFactory',
1111
'AssetManager\Resolver\PrioritizedPathsResolver' => 'AssetManager\Service\PrioritizedPathsResolverServiceFactory',
1212
'AssetManager\Resolver\CollectionResolver' => 'AssetManager\Service\CollectionResolverServiceFactory',
13+
'AssetManager\Resolver\ConcatResolver' => 'AssetManager\Service\ConcatResolverServiceFactory',
14+
'AssetManager\Resolver\AliasPathStackResolver' => 'AssetManager\Service\AliasPathStackResolverServiceFactory',
1315
),
1416
'invokables' => array(
15-
'mime_resolver' => 'AssetManager\Service\MimeResolver',
17+
'AssetManager\Service\MimeResolver' => 'AssetManager\Service\MimeResolver',
18+
),
19+
'aliases' => array(
20+
//Alias left here for BC
21+
'mime_resolver' => 'AssetManager\Service\MimeResolver',
1622
),
1723
),
1824
'asset_manager' => array(
Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
<?php
2+
3+
namespace AssetManagerTest\Config;
4+
5+
use PHPUnit_Framework_TestCase;
6+
use Zend\ServiceManager\Config;
7+
use Zend\ServiceManager\ServiceManager;
8+
9+
/**
10+
* Test to ensure config file is properly setup and all services are retrievable
11+
*
12+
* @package AssetManagerTest\Config
13+
*/
14+
class ModuleServiceManagerConfigTest extends PHPUnit_Framework_TestCase
15+
{
16+
/**
17+
* Test the Service Managers Factories.
18+
*
19+
* @coversNothing
20+
*/
21+
public function testServiceManagerFactories()
22+
{
23+
$config = include __DIR__.'/../../../config/module.config.php';
24+
25+
$serviceManagerConfig = new Config($config['service_manager']);
26+
$serviceManager = new ServiceManager($serviceManagerConfig);
27+
$serviceManager->setService('config', $config);
28+
29+
foreach ($config['service_manager']['factories'] as $serviceName => $service) {
30+
$this->assertTrue($serviceManager->has($serviceName));
31+
32+
//Make sure we can fetch the service
33+
$service = $serviceManager->get($serviceName);
34+
35+
$this->assertTrue(is_object($service));
36+
}
37+
38+
}
39+
40+
/**
41+
* Test the Service Managers Invokables.
42+
*
43+
* @coversNothing
44+
*/
45+
public function testServiceManagerInvokables()
46+
{
47+
$config = include __DIR__.'/../../../config/module.config.php';
48+
49+
$serviceManagerConfig = new Config($config['service_manager']);
50+
$serviceManager = new ServiceManager($serviceManagerConfig);
51+
$serviceManager->setService('config', $config);
52+
53+
foreach ($config['service_manager']['invokables'] as $serviceName => $service) {
54+
$this->assertTrue($serviceManager->has($serviceName));
55+
56+
//Make sure we can fetch the service
57+
$service = $serviceManager->get($serviceName);
58+
59+
$this->assertTrue(is_object($service));
60+
}
61+
}
62+
63+
/**
64+
* Test the Service Managers Invokables.
65+
*
66+
* @coversNothing
67+
*/
68+
public function testServiceManagerAliases()
69+
{
70+
$config = include __DIR__.'/../../../config/module.config.php';
71+
72+
$serviceManagerConfig = new Config($config['service_manager']);
73+
$serviceManager = new ServiceManager($serviceManagerConfig);
74+
$serviceManager->setService('config', $config);
75+
76+
foreach ($config['service_manager']['aliases'] as $serviceName => $service) {
77+
$this->assertTrue($serviceManager->has($serviceName));
78+
79+
//Make sure we can fetch the service
80+
$service = $serviceManager->get($serviceName);
81+
82+
$this->assertTrue(is_object($service));
83+
}
84+
}
85+
86+
/**
87+
* Test for Issue #134 - Test for specific mime_resolver invokable
88+
*
89+
* @coversNothing
90+
*/
91+
public function mimeResolverInvokableTest()
92+
{
93+
$config = include __DIR__.'/../../../config/module.config.php';
94+
95+
$serviceManagerConfig = new Config($config['service_manager']);
96+
$serviceManager = new ServiceManager($serviceManagerConfig);
97+
$serviceManager->setService('config', $config);
98+
99+
$this->assertTrue($serviceManager->has('AssetManager\Service\MimeResolver'));
100+
$this->assertTrue(is_object($serviceManager->get('AssetManager\Service\MimeResolver')));
101+
}
102+
103+
/**
104+
* Test for Issue #134 - Test for specific mime_resolver alias
105+
*
106+
* @coversNothing
107+
*/
108+
public function mimeResolverAliasTest()
109+
{
110+
$config = include __DIR__.'/../../../config/module.config.php';
111+
112+
$serviceManagerConfig = new Config($config['service_manager']);
113+
$serviceManager = new ServiceManager($serviceManagerConfig);
114+
$serviceManager->setService('config', $config);
115+
116+
$this->assertTrue($serviceManager->has('mime_resolver'));
117+
$this->assertTrue(is_object($serviceManager->get('mime_resolver')));
118+
}
119+
}

0 commit comments

Comments
 (0)