Skip to content

Commit aeaba37

Browse files
author
Mateus Junges
authored
Merge pull request mateusjunges#131 from mateusjunges/laravel-6
Add Support for Laravel 6
2 parents d7f7dc4 + a71af6e commit aeaba37

36 files changed

+93
-46
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/vendor
22
.idea
3-
composer.lock
3+
composer.lock
4+
.phpunit.result.cache

‎.travis.yml

+38-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,48 @@
11
language: php
22

3-
php:
4-
- 7.1
5-
- 7.2
6-
- 7.3
7-
- 7.4snapshot
8-
93
matrix:
4+
fast_finish: true
5+
include:
6+
- php: 7.2
7+
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-lowest'
8+
- php: 7.2
9+
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-stable'
10+
- php: 7.2
11+
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
12+
- php: 7.2
13+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
14+
- php: 7.2
15+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
16+
- php: 7.3
17+
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-stable'
18+
- php: 7.3
19+
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
20+
- php: 7.3
21+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
22+
- php: 7.3
23+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
24+
- php: 7.3
25+
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest'
26+
- php: 7.3
27+
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
28+
- php: 7.4snapshot
29+
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-stable'
30+
- php: 7.4snapshot
31+
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
32+
- php: 7.4snapshot
33+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
34+
- php: 7.4snapshot
35+
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable'
36+
1037
allow_failures:
1138
- php: 7.4snapshot
1239

13-
before_script:
40+
before_install:
1441
- travis_retry composer self-update
15-
- travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
42+
- travis_retry composer require --no-update --no-interaction "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}"
43+
44+
install:
45+
- travis_retry composer update ${COMPOSER_FLAGS} --prefer-dist --no-interaction --no-suggest
1646

1747
script:
1848
- vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
All notable changes to `mateusjunges/laravel-acl` will be documented in this file.
44

5+
## 2.1.0
6+
- Update dependencies for Laravel 6
7+
- Drop support for Laravel 5.5 and older, and PHP 7.1 and older. (They can use v2.0 of this package until they upgrade.)
8+
- Version 2.1.0 and greater of this package require PHP 7.2 and higher.
9+
510
## 2.0.3
611
- Fix composer.json dependencies for laravel 6.0
712

‎README.md

+11-1
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,20 @@ Or add this line in your `composer.json`, inside of the `require` section:
5252
``` json
5353
{
5454
"require": {
55-
"mateusjunges/laravel-acl": "2.0.*",
55+
"mateusjunges/laravel-acl": "2.1.*",
5656
}
5757
}
5858
```
59+
60+
> For Laravel v5.5 or lower, use the version 2.0 of this package:
61+
>``` json
62+
>{
63+
> "require": {
64+
> "mateusjunges/laravel-acl": "2.0.*",
65+
> }
66+
>}
67+
>```
68+
5969
then run ` composer install `
6070
6171
After installing the laravel-acl package, register the service provider in

‎composer.json

+6-5
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
],
1313
"homepage": "https://github.com/mateusjunges/laravel-acl",
1414
"require": {
15-
"php": ">=7.0",
16-
"illuminate/auth": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|^6.0",
17-
"illuminate/database": "5.4.*|5.5.*|5.6.*|5.7.*|5.8.*|^6.0"
15+
"php": "^7.2",
16+
"illuminate/auth": "^5.6|^5.7|^5.8|^6.0",
17+
"illuminate/support": "^5.6|^5.7|^5.8|^6.0",
18+
"illuminate/database": "^5.6|^5.7|^5.8|^6.0"
1819
},
1920
"require-dev": {
20-
"orchestra/testbench": "~3.4.2|~3.5.0|~3.6.0|~3.7.0",
21-
"phpunit/phpunit": "^5.7|6.2|^7.0",
21+
"orchestra/testbench": "^3.6|^3.7|^3.8",
22+
"phpunit/phpunit": "^7.0|^8.0",
2223
"predis/predis": "^1.1"
2324
},
2425
"license": "MIT",

‎src/Events/GroupSaving.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class GroupSaving
1515
/**
1616
* Create a new event instance.
1717
*
18-
* @param $attributes
18+
* @param $group
1919
*/
2020
public function __construct($group)
2121
{

‎src/Events/PermissionSaving.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class PermissionSaving
1515
/**
1616
* Create a new event instance.
1717
*
18-
* @param $attributes
18+
* @param $permission
1919
*/
2020
public function __construct($permission)
2121
{

‎tests/Commands/InstallCommandTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class InstallCommandTest extends TestCase
88
{
99
private $migrationsPath = 'migrations/vendor/junges/acl';
1010

11-
public function setUp()
11+
public function setUp() : void
1212
{
1313
parent::setUp();
1414
}

‎tests/Exceptions/ExceptionsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class ExceptionsTest extends TestCase
1111
{
12-
public function setUp()
12+
public function setUp() : void
1313
{
1414
parent::setUp();
1515
}

‎tests/Middlewares/HierarchicalPermissionsMiddlewareTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HierarchicalPermissionsMiddlewareTest extends MiddlewareTestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Middlewares/MiddlewareTestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class MiddlewareTestCase extends TestCase
3333
*/
3434
protected $hierarchicalMiddleware;
3535

36-
public function setUp()
36+
public function setUp() : void
3737
{
3838
parent::setUp();
3939
$this->permissionMiddleware = new PermissionMiddleware($this->app);

‎tests/TestCase.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class TestCase extends Orchestra
6767
/**
6868
* Set up the tests.
6969
*/
70-
public function setUp()
70+
public function setUp() : void
7171
{
7272
parent::setUp();
7373

‎tests/Traits/GroupPermissionsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class GroupPermissionsTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/GroupUsersTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class GroupUsersTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/GroupsTrait/HasAllPermissionsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasAllPermissionsMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/GroupsTrait/HasAnyPermissionMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasAnyPermissionMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/GroupsTrait/HasPermissionMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasPermissionMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/GroupsTrait/RemoveUserMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class RemoveUserMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/GroupsTrait/RevokeAllPermissionsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class RevokeAllPermissionsMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/GroupsTrait/SyncPermissionsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class SyncPermissionsMethodTest extends TestCase
88
{
9-
public function setUp()
9+
public function setUp() : void
1010
{
1111
parent::setUp();
1212
}

‎tests/Traits/UserGroupsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class UserGroupsTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/GetAllPermissionsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class GetAllPermissionsMethodTest extends TestCase
88
{
9-
public function setUp()
9+
public function setUp() : void
1010
{
1111
parent::setUp();
1212
}

‎tests/Traits/UsersTrait/HasAllGroupsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasAllGroupsMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/HasAllPermissionsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasAllPermissionsMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/HasAnyGroupMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasAnyGroupMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/HasAnyPermissionMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasAnyPermissionMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/HasDirectPermissionsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasDirectPermissionsMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/HasPermissionMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasPermissionMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/HasPermissionThroughGroupMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class HasPermissionThroughGroupMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/PermissionViaGroupsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class PermissionViaGroupsMethodTest extends TestCase
88
{
9-
public function setUp()
9+
public function setUp() : void
1010
{
1111
parent::setUp();
1212
}

‎tests/Traits/UsersTrait/RevokeAllGroupsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class RevokeAllGroupsMethodTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/RevokeAllPermissionsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class RevokeAllPermissionsTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

‎tests/Traits/UsersTrait/ScopeGroupTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class ScopeGroupTest extends TestCase
1111
{
12-
public function setUp()
12+
public function setUp() : void
1313
{
1414
parent::setUp();
1515
}

‎tests/Traits/UsersTrait/ScopePermissionTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class ScopePermissionTest extends TestCase
1111
{
12-
public function setUp()
12+
public function setUp() : void
1313
{
1414
parent::setUp();
1515
}

‎tests/Traits/UsersTrait/SyncPermissionsMethodTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
class SyncPermissionsMethodTest extends TestCase
88
{
9-
public function setUp()
9+
public function setUp() : void
1010
{
1111
parent::setUp();
1212
}

‎tests/Traits/WildcardPermissionsTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
class WildcardPermissionsTest extends TestCase
99
{
10-
public function setUp()
10+
public function setUp() : void
1111
{
1212
parent::setUp();
1313
}

0 commit comments

Comments
 (0)