Skip to content

Commit 0191696

Browse files
committed
Updated dependencies to latest stable versions
- Bumped minimum required PHP to 5.6, and allows 7 now. - Used `||` notation where multiple major versions are possible. - Removed console; we can test with a stdlib request.
1 parent 75c1e2d commit 0191696

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

composer.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,21 @@
2424
"branch-alias": {
2525
"dev-master": "1.1-dev",
2626
"dev-develop": "1.2-dev"
27+
},
28+
"zf": {
29+
"module": "ZF\\ApiProblem"
2730
}
2831
},
2932
"require": {
30-
"php": ">=5.5",
31-
"zendframework/zend-eventmanager": "~2.3",
32-
"zendframework/zend-http": "~2.3",
33-
"zendframework/zend-json": "~2.3",
34-
"zendframework/zend-mvc": "~2.3",
35-
"zendframework/zend-view": "~2.3"
33+
"php": "^5.6 || ^7.0",
34+
"zendframework/zend-eventmanager": "^2.6.3 || ^3.0.1",
35+
"zendframework/zend-http": "^2.5.4",
36+
"zendframework/zend-json": "^2.6.1 || ^3.0",
37+
"zendframework/zend-mvc": "^2.7.9 || ^3.0.2",
38+
"zendframework/zend-view": "^2.8.1"
3639
},
3740
"require-dev": {
38-
"phpunit/phpunit": "~4.7",
39-
"zendframework/zend-console": "~2.3",
40-
"zendframework/zend-loader": "~2.3",
41+
"phpunit/phpunit": "^4.8",
4142
"squizlabs/php_codesniffer": "^2.3.1"
4243
},
4344
"autoload": {

test/Listener/ApiProblemListenerTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
namespace ZFTest\ApiProblem\Listener;
88

99
use PHPUnit_Framework_TestCase as TestCase;
10-
use Zend\Console\Request as ConsoleRequest;
1110
use Zend\Http\Request;
1211
use Zend\Mvc\Application;
1312
use Zend\Mvc\MvcEvent;
13+
use Zend\Stdlib\RequestInterface;
1414
use ZF\ApiProblem\Exception\DomainException;
1515
use ZF\ApiProblem\Listener\ApiProblemListener;
1616

@@ -23,9 +23,10 @@ public function setUp()
2323
$this->listener = new ApiProblemListener();
2424
}
2525

26-
public function testOnRenderReturnsEarlyWhenConsoleRequestDetected()
26+
public function testOnRenderReturnsEarlyWhenNonHttpRequestDetected()
2727
{
28-
$this->event->setRequest(new ConsoleRequest());
28+
$request = $this->prophesize(RequestInterface::class)->reveal();
29+
$this->event->setRequest($request);
2930

3031
$this->assertNull($this->listener->onRender($this->event));
3132
}

0 commit comments

Comments
 (0)