Skip to content

Commit 9848a11

Browse files
authored
Merge pull request #260 from chris-doehring/feature/laravel-8
Add support for Laravel 8
2 parents caf5f01 + 28b9751 commit 9848a11

File tree

4 files changed

+89
-59
lines changed

4 files changed

+89
-59
lines changed

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/tests export-ignore
2+
.gitattributes export-ignore
3+
.gitignore export-ignore
4+
.travis.yml export-ignore
5+
phpunit.xml.dist export-ignore

.travis.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
language: php
2-
3-
php:
4-
- 7.2
5-
- 7.3
6-
7-
before_script:
8-
- travis_retry composer self-update
9-
- travis_retry composer install --no-interaction --prefer-source
10-
11-
script:
12-
- vendor/bin/phpunit --debug tests/
1+
language: php
2+
3+
php:
4+
- 7.2
5+
- 7.3
6+
- 7.4
7+
- 8.0snapshot
8+
9+
before_script:
10+
- travis_retry composer self-update
11+
- travis_retry composer install --no-interaction --prefer-source
12+
13+
script:
14+
- vendor/bin/phpunit

composer.json

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
{
2-
"name": "kodeine/laravel-acl",
3-
"description": "Light-weight role-based permissions for Laravel 5 built in Auth system.",
4-
"license": "MIT",
5-
"keywords": [
6-
"laravel",
7-
"permissions",
8-
"roles",
9-
"auth",
10-
"acl",
11-
"security",
12-
"eloquent"
13-
],
14-
"authors": [
15-
{
16-
"name": "Ahsen M.",
17-
"homepage": "https://github.com/kodeine",
18-
"role": "Developer"
19-
}
20-
],
21-
"require": {
22-
"php": ">=7.2",
23-
"illuminate/support": "^6.0|^7.0"
24-
},
25-
"require-dev": {
26-
"phpunit/phpunit": "^8.0",
27-
"orchestra/testbench": "^4.0|^5.0",
28-
"doctrine/dbal": "^2.9"
29-
},
30-
"autoload": {
31-
"psr-4": {
32-
"Kodeine\\Acl\\": "src/Kodeine/Acl"
33-
}
34-
},
35-
"autoload-dev": {
36-
"psr-4": {
37-
"Kodeine\\Acl\\Tests\\": "tests/"
38-
}
39-
},
40-
"extra": {
41-
"laravel": {
42-
"providers": [
43-
"Kodeine\\Acl\\AclServiceProvider"
44-
]
45-
}
46-
}
47-
}
1+
{
2+
"name": "kodeine/laravel-acl",
3+
"description": "Light-weight role-based permissions for Laravel 5 built in Auth system.",
4+
"license": "MIT",
5+
"keywords": [
6+
"laravel",
7+
"permissions",
8+
"roles",
9+
"auth",
10+
"acl",
11+
"security",
12+
"eloquent"
13+
],
14+
"authors": [
15+
{
16+
"name": "Ahsen M.",
17+
"homepage": "https://github.com/kodeine",
18+
"role": "Developer"
19+
}
20+
],
21+
"require": {
22+
"php": ">=7.2",
23+
"illuminate/support": "^6.0|^7.0|^8.0"
24+
},
25+
"require-dev": {
26+
"phpunit/phpunit": "^8.0|^9.0",
27+
"orchestra/testbench": "^5.0|^6.0",
28+
"doctrine/dbal": "^2.9"
29+
},
30+
"autoload": {
31+
"psr-4": {
32+
"Kodeine\\Acl\\": "src/Kodeine/Acl"
33+
}
34+
},
35+
"autoload-dev": {
36+
"psr-4": {
37+
"Kodeine\\Acl\\Tests\\": "tests/"
38+
}
39+
},
40+
"extra": {
41+
"laravel": {
42+
"providers": [
43+
"Kodeine\\Acl\\AclServiceProvider"
44+
]
45+
}
46+
}
47+
}

phpunit.xml.dist

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<phpunit backupGlobals="false"
3+
backupStaticAttributes="false"
4+
colors="true"
5+
convertErrorsToExceptions="true"
6+
convertNoticesToExceptions="true"
7+
convertWarningsToExceptions="true"
8+
processIsolation="false"
9+
stopOnError="false"
10+
stopOnFailure="false"
11+
verbose="true"
12+
>
13+
<testsuites>
14+
<testsuite name="Laravel-ACL Test Suite">
15+
<directory suffix="Test.php">./tests</directory>
16+
</testsuite>
17+
</testsuites>
18+
<filter>
19+
<whitelist processUncoveredFilesFromWhitelist="true">
20+
<directory suffix=".php">./src</directory>
21+
</whitelist>
22+
</filter>
23+
</phpunit>

0 commit comments

Comments
 (0)