Skip to content

Commit 680f549

Browse files
committed
Merge branch 'laminas-compat'
* laminas-compat: add void in tearDown add void in setup phpunit compat apply laminas compatible by remove Module::getModuleDependencies()
2 parents 59847d8 + ef90f03 commit 680f549

File tree

9 files changed

+10
-25
lines changed

9 files changed

+10
-25
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ dist: trusty
33
language: php
44

55
php:
6-
- 7.1
76
- 7.2
87
- 7.3
9-
8+
109
before_install:
1110
- mkdir -p build/logs
1211
- composer self-update

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
],
2020
"require": {
21-
"php": "^7.1",
21+
"php": "^7.2",
2222
"zendframework/zend-json": "^2.5 || ^3.0",
2323
"zendframework/zend-mvc": "^3.0",
2424
"zendframework/zend-session": "^2.8.4"

src/Module.php

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
use Zend\EventManager\EventInterface;
2525
use Zend\ModuleManager\Feature\ConfigProviderInterface;
26-
use Zend\ModuleManager\Feature\DependencyIndicatorInterface;
2726
use Zend\Mvc\Controller\AbstractActionController;
2827
use Zend\Mvc\MvcEvent;
2928
use Zend\Session\Container;
@@ -32,7 +31,7 @@
3231
/**
3332
* @author Abdul Malik Ikhsan <[email protected]>
3433
*/
35-
class Module implements ConfigProviderInterface, DependencyIndicatorInterface
34+
class Module implements ConfigProviderInterface
3635
{
3736
/**
3837
* Bootstrap Handle FlashMessenger session show.
@@ -95,12 +94,4 @@ public function getConfig() : array
9594
{
9695
return include __DIR__.'/../config/module.config.php';
9796
}
98-
99-
/**
100-
* {@inheritdoc}
101-
*/
102-
public function getModuleDependencies() : array
103-
{
104-
return ['ZendDeveloperTools'];
105-
}
10697
}

test/Collector/SessionCollectorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class SessionCollectorTest extends TestCase
4646
/**
4747
* initialize properties.
4848
*/
49-
protected function setUp()
49+
protected function setUp(): void
5050
{
5151
$this->sessionCollector = new SessionCollector(new SessionManager());
5252
$this->sessionContainer = new Container();
@@ -117,7 +117,7 @@ public function testGetSessionDataForEmpty()
117117
$this->assertEquals([], $this->sessionCollector->getSessionData());
118118
}
119119

120-
protected function tearDown()
120+
protected function tearDown(): void
121121
{
122122
$this->sessionContainer->offsetUnset('word');
123123
$this->sessionContainer->offsetUnset('a');

test/Controller/SessionToolbarControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
*/
3030
class SessionToolbarControllerTest extends AbstractHttpControllerTestCase
3131
{
32-
protected function setUp()
32+
protected function setUp(): void
3333
{
3434
$this->setApplicationConfig([
3535
'modules' => [

test/Factory/Collector/SessionCollectorFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class SessionCollectorFactoryTest extends TestCase
3636
/** @var ContainerInterface */
3737
protected $serviceLocator;
3838

39-
protected function setUp()
39+
protected function setUp(): void
4040
{
4141
/** @var ContainerInterface $serviceLocator */
4242
$serviceLocator = $this->prophesize('Psr\Container\ContainerInterface');

test/Factory/Controller/SessionToolbarControllerFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class SessionToolbarControllerFactoryTest extends TestCase
3636
/** @var ContainerInterface */
3737
protected $serviceLocator;
3838

39-
protected function setUp()
39+
protected function setUp(): void
4040
{
4141
/** @var ServiceLocatorInterface $serviceLocator */
4242
$serviceLocator = $this->prophesize('Psr\Container\ContainerInterface');

test/Manager/SessionMangerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class SessionMangerTest extends TestCase
3838
/**
3939
* initialize properties.
4040
*/
41-
protected function setUp()
41+
protected function setUp(): void
4242
{
4343
$this->manager = new SessionManager();
4444
}

test/ModuleTest.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ModuleTest extends TestCase
3434
*/
3535
protected $module;
3636

37-
protected function setUp()
37+
protected function setUp(): void
3838
{
3939
$this->module = new Module();
4040
}
@@ -174,9 +174,4 @@ public function testGetConfig()
174174
{
175175
$this->assertTrue(is_array($this->module->getConfig()));
176176
}
177-
178-
public function testGetModuleDependencies()
179-
{
180-
$this->assertEquals(['ZendDeveloperTools'], $this->module->getModuleDependencies());
181-
}
182177
}

0 commit comments

Comments
 (0)