Skip to content

Commit db1c6e5

Browse files
ajoy39ajoy39
committed
remove old compatibility code
1 parent 640a48c commit db1c6e5

File tree

6 files changed

+9
-104
lines changed

6 files changed

+9
-104
lines changed

‎src/Kodeine/Acl/AclServiceProvider.php‎

Lines changed: 3 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use Blade;
66
use Illuminate\Support\ServiceProvider;
7-
use Illuminate\Support\Str;
87

98
class AclServiceProvider extends ServiceProvider
109
{
@@ -24,15 +23,7 @@ public function boot()
2423
{
2524
$this->publishConfig();
2625
$this->loadMigrationsFrom(__DIR__ . '/../../migrations');
27-
28-
$laravel = app();
29-
if ( substr($laravel::VERSION, 0, 2) === (string) "5.0" ) {
30-
$this->registerBlade5_0();
31-
} else if ( (substr($laravel::VERSION, 0, 2) === (string) "5.1") || (substr($laravel::VERSION, 0, 2) === (string) "5.2") ) {
32-
$this->registerBlade5_1();
33-
} else {
34-
$this->registerBlade5_3();
35-
}
26+
$this->registerBladeDirectives();
3627
}
3728

3829
/**
@@ -57,7 +48,7 @@ public function publishConfig()
5748
], 'config');
5849
}
5950

60-
protected function registerBlade5_3()
51+
public function registerBladeDirectives()
6152
{
6253
// role
6354
Blade::directive('role', function ($expression) {
@@ -70,62 +61,11 @@ protected function registerBlade5_3()
7061

7162
// permission
7263
Blade::directive('permission', function ($expression) {
73-
return "<?php if (Auth::check() && Auth::user()->can({$expression})): ?>";
74-
});
75-
76-
Blade::directive('endpermission', function () {
77-
return "<?php endif; ?>";
78-
});
79-
}
80-
81-
/**
82-
* Register Blade Template Extensions for >= L5.1
83-
*/
84-
protected function registerBlade5_1()
85-
{
86-
// role
87-
Blade::directive('role', function ($expression) {
88-
return "<?php if (Auth::check() && Auth::user()->is{$expression}): ?>";
89-
});
90-
91-
Blade::directive('endrole', function () {
92-
return "<?php endif; ?>";
93-
});
94-
95-
// permission
96-
Blade::directive('permission', function ($expression) {
97-
return "<?php if (Auth::check() && Auth::user()->can{$expression}): ?>";
64+
return "<?php if (Auth::check() && Auth::user()->hasPermission({$expression})): ?>";
9865
});
9966

10067
Blade::directive('endpermission', function () {
10168
return "<?php endif; ?>";
10269
});
10370
}
104-
105-
/**
106-
* Register Blade Template Extensions for <= L5.0
107-
*/
108-
protected function registerBlade5_0()
109-
{
110-
$blade = $this->app['view']->getEngineResolver()->resolve('blade')->getCompiler();
111-
$blade->extend(function ($view, $compiler) {
112-
$pattern = $compiler->createMatcher('role');
113-
return preg_replace($pattern, '<?php if (Auth::check() && Auth::user()->is$2): ?> ', $view);
114-
});
115-
116-
$blade->extend(function ($view, $compiler) {
117-
$pattern = $compiler->createPlainMatcher('endrole');
118-
return preg_replace($pattern, '<?php endif; ?>', $view);
119-
});
120-
121-
$blade->extend(function ($view, $compiler) {
122-
$pattern = $compiler->createMatcher('permission');
123-
return preg_replace($pattern, '<?php if (Auth::check() && Auth::user()->can$2): ?> ', $view);
124-
});
125-
126-
$blade->extend(function ($view, $compiler) {
127-
$pattern = $compiler->createPlainMatcher('endpermission');
128-
return preg_replace($pattern, '<?php endif; ?>', $view);
129-
});
130-
}
13171
}

‎src/Kodeine/Acl/Helper/Helper.php‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,6 @@
66

77
trait Helper
88
{
9-
/*
10-
|----------------------------------------------------------------------
11-
| Collection methods compatible with L5.1.
12-
|----------------------------------------------------------------------
13-
|
14-
*/
15-
16-
/**
17-
* Lists() method in l5.1 returns collection.
18-
* This method fixes that issue for backward
19-
* compatibility.
20-
*
21-
* @param $data
22-
* @return mixed
23-
*/
24-
protected function collectionAsArray($data)
25-
{
26-
return ($data instanceof Collection)
27-
? $data->toArray()
28-
: $data;
29-
}
30-
319
/*
3210
|----------------------------------------------------------------------
3311
| Slug Permission Related Protected Methods
@@ -104,9 +82,7 @@ protected function mapArray($item, \Closure $closure)
10482

10583
// item is a collection.
10684
if ($item instanceof Collection) {
107-
$item = $this->collectionAsArray(
108-
method_exists($item, 'pluck') ? $item->pluck('name') : $item->lists('name')
109-
);
85+
$item = $item->pluck('name')->all();
11086
}
11187

11288
// multiple items

‎src/Kodeine/Acl/Middleware/HasPermission.php‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,6 @@ private function filterMethods($methods, $callback) {
155155
*/
156156
protected function forbiddenRoute()
157157
{
158-
/*$action = $request->route()->getAction();
159-
if ( isset($action['except']) ) {
160-
dd($request->user()->roles->lists('slug'));
161-
dd($request->user()->getPermissions());
162-
//return $action['except'] == $request->user()->role->slug;
163-
}*/
164-
165158
return false;
166159
}
167160

‎src/Kodeine/Acl/Traits/HasPermissionInheritance.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,7 @@ public function getPermissionsInherited()
4747
// process inherit_id recursively
4848
$inherited = $this->getRecursiveInherit($row->inherit_id, $row->slug);
4949
$merge = $permissions->where('name', $row->name);
50-
$merge = method_exists($merge, 'pluck') ? $merge->pluck('slug', 'name') : $merge->lists('slug', 'name');
51-
52-
// fix for l5.1 and backward compatibility.
53-
// lists() method should return as an array.
54-
$merge = $this->collectionAsArray($merge);
50+
$merge = $merge->pluck('slug', 'name')->all();
5551

5652
// replace and merge permissions
5753
$rights = array_replace_recursive($rights, $inherited, $merge);

‎src/Kodeine/Acl/Traits/HasRole.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ function () {
4848
}
4949
);
5050

51-
$slugs = method_exists($this_roles, 'pluck') ? $this_roles->pluck('slug','id') : $this_roles->lists('slug','id');
51+
$slugs = $this_roles->pluck('slug','id');
5252
return is_null($this_roles)
5353
? []
54-
: $this->collectionAsArray($slugs);
54+
: $slugs->all();
5555
}
5656

5757
/**

‎src/Kodeine/Acl/Traits/HasUserPermission.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ protected function extractAlias($str)
119119
*/
120120
protected function addSlug($alias, array $permissions)
121121
{
122-
$slugs = method_exists($this->permissions, 'pluck') ? $this->permissions->pluck('slug', 'name') : $this->permissions->lists('slug', 'name');
122+
$slugs = $this->permissions->pluck('slug', 'name');
123123
$collection = new Collection($slugs);
124124

125125
if ( $collection->has($alias) ) {
@@ -140,7 +140,7 @@ protected function addSlug($alias, array $permissions)
140140
*/
141141
protected function removeSlug($alias, array $permissions)
142142
{
143-
$slugs = method_exists($this->permissions, 'pluck') ? $this->permissions->pluck('slug', 'name') : $this->permissions->lists('slug', 'name');
143+
$slugs = $this->permissions->pluck('slug', 'name');
144144
$collection = new Collection($slugs);
145145

146146
if ( $collection->has($alias) ) {

0 commit comments

Comments
 (0)