Skip to content

Commit bd9a325

Browse files
spekkionuspekkionu
committed
Increase php version to match Laravel 5.1
Replace filter tests with middleware tests.
1 parent 6282e66 commit bd9a325

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
lines changed

‎.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.4
54
- 5.5
65
- 5.6
76
- hhvm

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=5.3.0",
13+
"php": ">=5.5.9",
1414
"zendframework/zend-permissions-acl": "2.5.*",
1515
"illuminate/support": "5.1.*"
1616
},

‎tests/AclRouteFilterTest.php renamed to ‎tests/AclRouteMiddlewareTest.php

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
<?php namespace Spekkionu\ZendAcl;
22

33
use PHPUnit_Framework_TestCase;
4-
use Spekkionu\ZendAcl\AclRouteFilter;
4+
use Spekkionu\ZendAcl\AclMiddleware;
55
use \Mockery as m;
6+
use Closure;
67

78
function view($view) {
8-
return AclRouteFilterTest::$functions->view($view);
9+
return AclRouteMiddlewareTest::$functions->view($view);
910
}
1011

1112
function redirect($url = null) {
12-
return AclRouteFilterTest::$functions->redirect($url);
13+
return AclRouteMiddlewareTest::$functions->redirect($url);
1314
}
1415

1516
function response($body = null, $status = null) {
16-
return AclRouteFilterTest::$functions->response($body, $status);
17+
return AclRouteMiddlewareTest::$functions->response($body, $status);
1718
}
1819

19-
class AclRouteFilterTest extends PHPUnit_Framework_TestCase
20+
class AclRouteMiddlewareTest extends PHPUnit_Framework_TestCase
2021
{
2122

2223
public static $functions;
@@ -45,12 +46,12 @@ public function testFilter()
4546
$acl = m::mock('Zend\Permissions\Acl\Acl');
4647
$acl->shouldReceive('isAllowed')->once()->with('member', $resource, $permission)->andReturn(true);
4748

48-
$route = m::mock('Illuminate\Routing\Route');
49-
49+
$closure = function($request){};
50+
5051
$request = m::mock('Illuminate\Http\Request');
5152

52-
$filter = new AclRouteFilter($auth, $acl, $config);
53-
$allowed = $filter->filter($route, $request, $resource, $permission);
53+
$filter = new AclMiddleware($auth, $acl, $config);
54+
$allowed = $filter->handle($request, $closure, $resource, $permission);
5455
}
5556

5657
public function testFilterAuthFail()
@@ -70,15 +71,15 @@ public function testFilterAuthFail()
7071
$acl = m::mock('Zend\Permissions\Acl\Acl');
7172
$acl->shouldReceive('isAllowed')->once()->with('member', $resource, $permission)->andReturn(false);
7273

73-
$route = m::mock('Illuminate\Routing\Route');
74+
$closure = function($request){};
7475

7576
$request = m::mock('Illuminate\Http\Request');
7677
$request->shouldReceive('ajax')->once()->andReturn(false);
7778

7879
self::$functions->shouldReceive('view')->once()->with('zendacl::unauthorized');
7980

80-
$filter = new AclRouteFilter($auth, $acl, $config);
81-
$allowed = $filter->filter($route, $request, $resource, $permission);
81+
$filter = new AclMiddleware($auth, $acl, $config);
82+
$allowed = $filter->handle($request, $closure, $resource, $permission);
8283
}
8384

8485
public function testFilterForGuest()
@@ -94,12 +95,12 @@ public function testFilterForGuest()
9495
$acl = m::mock('Zend\Permissions\Acl\Acl');
9596
$acl->shouldReceive('isAllowed')->once()->andReturn(true)->with('guest', $resource, $permission);
9697

97-
$route = m::mock('Illuminate\Routing\Route');
98+
$closure = function($request){};
9899

99100
$request = m::mock('Illuminate\Http\Request');
100101

101-
$filter = new AclRouteFilter($auth, $acl, $config);
102-
$allowed = $filter->filter($route, $request, $resource, $permission);
102+
$filter = new AclMiddleware($auth, $acl, $config);
103+
$allowed = $filter->handle($request, $closure, $resource, $permission);
103104
}
104105

105106
public function testFilterFailedView()
@@ -117,15 +118,15 @@ public function testFilterFailedView()
117118
$acl = m::mock('Zend\Permissions\Acl\Acl');
118119
$acl->shouldReceive('isAllowed')->once()->andReturn(false)->with('guest', $resource, $permission);
119120

120-
$route = m::mock('Illuminate\Routing\Route');
121+
$closure = function($request){};
121122

122123
$request = m::mock('Illuminate\Http\Request');
123124
$request->shouldReceive('ajax')->once()->andReturn(false);
124125

125126
self::$functions->shouldReceive('view')->once()->with('zendacl::unauthorized');
126127

127-
$filter = new AclRouteFilter($auth, $acl, $config);
128-
$allowed = $filter->filter($route, $request, $resource, $permission);
128+
$filter = new AclMiddleware($auth, $acl, $config);
129+
$allowed = $filter->handle($request, $closure, $resource, $permission);
129130
}
130131

131132
public function testFilterFailedRedirect()
@@ -143,15 +144,15 @@ public function testFilterFailedRedirect()
143144
$acl = m::mock('Zend\Permissions\Acl\Acl');
144145
$acl->shouldReceive('isAllowed')->once()->andReturn(false)->with('guest', $resource, $permission);
145146

146-
$route = m::mock('Illuminate\Routing\Route');
147+
$closure = function($request){};
147148

148149
$request = m::mock('Illuminate\Http\Request');
149150
$request->shouldReceive('ajax')->once()->andReturn(false);
150151

151152
self::$functions->shouldReceive('redirect')->once()->with('auth/login')->once();
152153

153-
$filter = new AclRouteFilter($auth, $acl, $config);
154-
$allowed = $filter->filter($route, $request, $resource, $permission);
154+
$filter = new AclMiddleware($auth, $acl, $config);
155+
$allowed = $filter->handle($request, $closure, $resource, $permission);
155156
}
156157

157158
public function testFilterFailedRoute()
@@ -169,7 +170,7 @@ public function testFilterFailedRoute()
169170
$acl = m::mock('Zend\Permissions\Acl\Acl');
170171
$acl->shouldReceive('isAllowed')->once()->andReturn(false)->with('guest', $resource, $permission);
171172

172-
$route = m::mock('Illuminate\Routing\Route');
173+
$closure = function($request){};
173174

174175
$request = m::mock('Illuminate\Http\Request');
175176
$request->shouldReceive('ajax')->once()->andReturn(false);
@@ -179,8 +180,8 @@ public function testFilterFailedRoute()
179180

180181
self::$functions->shouldReceive('redirect')->once()->andReturn($redirect);
181182

182-
$filter = new AclRouteFilter($auth, $acl, $config);
183-
$allowed = $filter->filter($route, $request, $resource, $permission);
183+
$filter = new AclMiddleware($auth, $acl, $config);
184+
$allowed = $filter->handle($request, $closure, $resource, $permission);
184185
}
185186

186187
public function testFilterFailedAjax()
@@ -196,14 +197,14 @@ public function testFilterFailedAjax()
196197
$acl = m::mock('Zend\Permissions\Acl\Acl');
197198
$acl->shouldReceive('isAllowed')->once()->andReturn(false)->with('guest', $resource, $permission);
198199

199-
$route = m::mock('Illuminate\Routing\Route');
200+
$closure = function($request){};
200201

201202
$request = m::mock('Illuminate\Http\Request');
202203
$request->shouldReceive('ajax')->once()->andReturn(true);
203204

204205
self::$functions->shouldReceive('response')->once()->with('Unauthorized.', 401);
205206

206-
$filter = new AclRouteFilter($auth, $acl, $config);
207-
$allowed = $filter->filter($route, $request, $resource, $permission);
207+
$filter = new AclMiddleware($auth, $acl, $config);
208+
$allowed = $filter->handle($request, $closure, $resource, $permission);
208209
}
209210
}

0 commit comments

Comments
 (0)