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

Commit 8732361

Browse files
ezimuelezimuel
committed
Fixed the unit test
1 parent 24ff129 commit 8732361

File tree

5 files changed

+29
-28
lines changed

5 files changed

+29
-28
lines changed

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"zendframework/zend-http": "~2.5",
2424
"zendframework/zend-servicemanager": "dev-develop as 2.5",
2525
"zendframework/zend-validator": "~2.5",
26+
"container-interop/container-interop": "^1.1",
2627
"fabpot/php-cs-fixer": "1.7.*",
2728
"phpunit/PHPUnit": "~4.0"
2829
},

‎test/Service/ContainerAbstractServiceFactoryTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function validContainers()
6161
*/
6262
public function testCanRetrieveNamedContainers($serviceName, $containerName)
6363
{
64-
$this->assertTrue($this->services->has($serviceName, true), "Container does not have service by name '$serviceName'");
64+
$this->assertTrue($this->services->has($serviceName), "Container does not have service by name '$serviceName'");
6565
$container = $this->services->get($serviceName);
6666
$this->assertInstanceOf('Zend\Session\Container', $container);
6767
$this->assertEquals($containerName, $container->getName());
@@ -72,7 +72,7 @@ public function testCanRetrieveNamedContainers($serviceName, $containerName)
7272
*/
7373
public function testContainersAreInjectedWithSessionManagerService($serviceName, $containerName)
7474
{
75-
$this->assertTrue($this->services->has($serviceName, true), "Container does not have service by name '$serviceName'");
75+
$this->assertTrue($this->services->has($serviceName), "Container does not have service by name '$serviceName'");
7676
$container = $this->services->get($serviceName);
7777
$this->assertSame($this->services->get('Zend\Session\ManagerInterface'), $container->getManager());
7878
}

‎test/Service/SessionConfigFactoryTest.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,20 @@ public function setUp()
2929

3030
public function testCreatesSessionConfigByDefault()
3131
{
32-
$services = $this->services->withConfig([
32+
$this->services->configure([
3333
'services' => [
3434
'config' => [
3535
'session_config' => [],
3636
],
3737
],
3838
]);
39-
$config = $services->get('Zend\Session\Config\ConfigInterface');
39+
$config = $this->services->get('Zend\Session\Config\ConfigInterface');
4040
$this->assertInstanceOf('Zend\Session\Config\SessionConfig', $config);
4141
}
4242

4343
public function testCanCreateAlternateSessionConfigTypeViaConfigClassKey()
4444
{
45-
$services = $this->services->withConfig([
45+
$this->services->configure([
4646
'services' => [
4747
'config' => [
4848
'session_config' => [
@@ -51,15 +51,15 @@ public function testCanCreateAlternateSessionConfigTypeViaConfigClassKey()
5151
],
5252
],
5353
]);
54-
$config = $services->get('Zend\Session\Config\ConfigInterface');
54+
$config = $this->services->get('Zend\Session\Config\ConfigInterface');
5555
$this->assertInstanceOf('Zend\Session\Config\StandardConfig', $config);
5656
// Since SessionConfig extends StandardConfig, need to test that it's not that
5757
$this->assertNotInstanceOf('Zend\Session\Config\SessionConfig', $config);
5858
}
5959

6060
public function testServiceReceivesConfiguration()
6161
{
62-
$services = $this->services->withConfig([
62+
$this->services->configure([
6363
'services' => [
6464
'config' => [
6565
'session_config' => [
@@ -69,7 +69,7 @@ public function testServiceReceivesConfiguration()
6969
],
7070
],
7171
]);
72-
$config = $services->get('Zend\Session\Config\ConfigInterface');
72+
$config = $this->services->get('Zend\Session\Config\ConfigInterface');
7373
$this->assertEquals('zf2', $config->getName());
7474
}
7575
}

‎test/Service/SessionManagerFactoryTest.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ public function testCreatesSessionManager()
3838
public function testConfigObjectIsInjectedIfPresentInServices()
3939
{
4040
$config = $this->getMock('Zend\Session\Config\ConfigInterface');
41-
$services = $this->services->withConfig([
41+
$this->services->configure([
4242
'services' => [
4343
'Zend\Session\Config\ConfigInterface' => $config,
4444
],
4545
]);
46-
$manager = $services->get('Zend\Session\ManagerInterface');
46+
$manager = $this->services->get('Zend\Session\ManagerInterface');
4747
$test = $manager->getConfig();
4848
$this->assertSame($config, $test);
4949
}
@@ -52,25 +52,25 @@ public function testFactoryWillInjectStorageIfPresentInServices()
5252
{
5353
// Using concrete version here as mocking was too complex
5454
$storage = new ArrayStorage();
55-
$services = $this->services->withConfig([
55+
$this->services->configure([
5656
'services' => [
5757
'Zend\Session\Storage\StorageInterface' => $storage,
5858
],
5959
]);
60-
$manager = $services->get('Zend\Session\ManagerInterface');
60+
$manager = $this->services->get('Zend\Session\ManagerInterface');
6161
$test = $manager->getStorage();
6262
$this->assertSame($storage, $test);
6363
}
6464

6565
public function testFactoryWillInjectSaveHandlerIfPresentInServices()
6666
{
6767
$saveHandler = $this->getMock('Zend\Session\SaveHandler\SaveHandlerInterface');
68-
$services = $this->services->withConfig([
68+
$this->services->configure([
6969
'services' => [
7070
'Zend\Session\SaveHandler\SaveHandlerInterface' => $saveHandler,
7171
],
7272
]);
73-
$manager = $services->get('Zend\Session\ManagerInterface');
73+
$manager = $this->services->get('Zend\Session\ManagerInterface');
7474
$test = $manager->getSaveHandler();
7575
$this->assertSame($saveHandler, $test);
7676
}
@@ -86,12 +86,12 @@ public function testCanDisableContainerDefaultManagerInjectionViaConfiguration()
8686
$config = ['session_manager' => [
8787
'enable_default_container_manager' => false,
8888
]];
89-
$services = $this->services->withConfig([
89+
$this->services->configure([
9090
'services' => [
9191
'config' => $config,
9292
],
9393
]);
94-
$manager = $services->get('Zend\Session\ManagerInterface');
94+
$manager = $this->services->get('Zend\Session\ManagerInterface');
9595
$this->assertNotSame($manager, Container::getDefaultManager());
9696
}
9797

@@ -105,12 +105,12 @@ public function testFactoryWillAddValidatorViaConfiguration()
105105
'Zend\Session\Validator\RemoteAddr',
106106
],
107107
]];
108-
$services = $this->services->withConfig([
108+
$this->services->configure([
109109
'services' => [
110110
'config' => $config,
111111
],
112112
]);
113-
$manager = $services->get('Zend\Session\ManagerInterface');
113+
$manager = $this->services->get('Zend\Session\ManagerInterface');
114114

115115
$manager->start();
116116

@@ -126,13 +126,13 @@ public function testFactoryWillAddValidatorViaConfiguration()
126126
public function testStartingSessionManagerFromFactoryDoesNotTriggerUndefinedVariable()
127127
{
128128
$storage = new ArrayStorage();
129-
$services = $this->services->withConfig([
129+
$this->services->configure([
130130
'services' => [
131131
'Zend\Session\Storage\StorageInterface' => $storage
132132
],
133133
]);
134134

135-
$manager = $services->get('Zend\Session\ManagerInterface');
135+
$manager = $this->services->get('Zend\Session\ManagerInterface');
136136
$manager->start();
137137

138138
$this->assertSame($storage, $manager->getStorage());
@@ -148,7 +148,7 @@ public function testFactoryDoesNotOverwriteValidatorStorageValues()
148148
'Zend\Session\Validator\HttpUserAgent' => 'Foo',
149149
'Zend\Session\Validator\RemoteAddr' => '1.2.3.4',
150150
]);
151-
$services = $this->services->withConfig([
151+
$this->services->configure([
152152
'services' => [
153153
'Zend\Session\Storage\StorageInterface' => $storage,
154154
'config' => [
@@ -163,7 +163,7 @@ public function testFactoryDoesNotOverwriteValidatorStorageValues()
163163
]);
164164

165165
// This call is needed to make sure session storage data is not overwritten by the factory
166-
$manager = $services->get('Zend\Session\ManagerInterface');
166+
$manager = $this->services->get('Zend\Session\ManagerInterface');
167167

168168
$validatorData = $storage->getMetaData('_VALID');
169169
$this->assertSame('Foo', $validatorData['Zend\Session\Validator\HttpUserAgent']);
@@ -179,7 +179,7 @@ public function testFactoryDoesNotAttachValidatorTwoTimes()
179179
$storage->setMetadata('_VALID', [
180180
'Zend\Session\Validator\RemoteAddr' => '1.2.3.4',
181181
]);
182-
$services = $this->services->withConfig([
182+
$this->services->configure([
183183
'services' => [
184184
'Zend\Session\Storage\StorageInterface' => $storage,
185185
'config' => [
@@ -192,7 +192,7 @@ public function testFactoryDoesNotAttachValidatorTwoTimes()
192192
],
193193
]);
194194

195-
$manager = $services->get('Zend\Session\ManagerInterface');
195+
$manager = $this->services->get('Zend\Session\ManagerInterface');
196196
try {
197197
$manager->start();
198198
} catch (\RuntimeException $e) {

‎test/Service/StorageFactoryTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ public function sessionStorageConfig()
7878
*/
7979
public function testUsesConfigurationToCreateStorage($config, $class)
8080
{
81-
$services = $this->services->withConfig([
81+
$this->services->configure([
8282
'services' => [
8383
'config' => $config
8484
]
8585
]);
86-
$storage = $services->get('Zend\Session\Storage\StorageInterface');
86+
$storage = $this->services->get('Zend\Session\Storage\StorageInterface');
8787
$this->assertInstanceOf($class, $storage);
8888
$test = $storage->toArray();
8989
$this->assertEquals($config['session_storage']['options']['input'], $test);
@@ -126,12 +126,12 @@ public function invalidSessionStorageConfig()
126126
*/
127127
public function testInvalidConfigurationRaisesServiceNotCreatedException($config)
128128
{
129-
$services = $this->services->withConfig([
129+
$this->services->configure([
130130
'services' => [
131131
'config' => $config
132132
]
133133
]);
134134
$this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotCreatedException');
135-
$storage = $services->get('Zend\Session\Storage\StorageInterface');
135+
$storage = $this->services->get('Zend\Session\Storage\StorageInterface');
136136
}
137137
}

0 commit comments

Comments
 (0)