Skip to content

Commit

Permalink
Merge pull request #260 from chris-doehring/feature/laravel-8
Browse files Browse the repository at this point in the history
Add support for Laravel 8
  • Loading branch information
kodeine committed Nov 25, 2020
2 parents caf5f01 + 28b9751 commit 9848a11
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 59 deletions.
5 changes: 5 additions & 0 deletions .gitattributes
@@ -0,0 +1,5 @@
/tests export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
phpunit.xml.dist export-ignore
26 changes: 14 additions & 12 deletions .travis.yml
@@ -1,12 +1,14 @@
language: php

php:
- 7.2
- 7.3

before_script:
- travis_retry composer self-update
- travis_retry composer install --no-interaction --prefer-source

script:
- vendor/bin/phpunit --debug tests/
language: php

php:
- 7.2
- 7.3
- 7.4
- 8.0snapshot

before_script:
- travis_retry composer self-update
- travis_retry composer install --no-interaction --prefer-source

script:
- vendor/bin/phpunit
94 changes: 47 additions & 47 deletions composer.json
@@ -1,47 +1,47 @@
{
"name": "kodeine/laravel-acl",
"description": "Light-weight role-based permissions for Laravel 5 built in Auth system.",
"license": "MIT",
"keywords": [
"laravel",
"permissions",
"roles",
"auth",
"acl",
"security",
"eloquent"
],
"authors": [
{
"name": "Ahsen M.",
"homepage": "https://github.com/kodeine",
"role": "Developer"
}
],
"require": {
"php": ">=7.2",
"illuminate/support": "^6.0|^7.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"orchestra/testbench": "^4.0|^5.0",
"doctrine/dbal": "^2.9"
},
"autoload": {
"psr-4": {
"Kodeine\\Acl\\": "src/Kodeine/Acl"
}
},
"autoload-dev": {
"psr-4": {
"Kodeine\\Acl\\Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"providers": [
"Kodeine\\Acl\\AclServiceProvider"
]
}
}
}
{
"name": "kodeine/laravel-acl",
"description": "Light-weight role-based permissions for Laravel 5 built in Auth system.",
"license": "MIT",
"keywords": [
"laravel",
"permissions",
"roles",
"auth",
"acl",
"security",
"eloquent"
],
"authors": [
{
"name": "Ahsen M.",
"homepage": "https://github.com/kodeine",
"role": "Developer"
}
],
"require": {
"php": ">=7.2",
"illuminate/support": "^6.0|^7.0|^8.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0|^9.0",
"orchestra/testbench": "^5.0|^6.0",
"doctrine/dbal": "^2.9"
},
"autoload": {
"psr-4": {
"Kodeine\\Acl\\": "src/Kodeine/Acl"
}
},
"autoload-dev": {
"psr-4": {
"Kodeine\\Acl\\Tests\\": "tests/"
}
},
"extra": {
"laravel": {
"providers": [
"Kodeine\\Acl\\AclServiceProvider"
]
}
}
}
23 changes: 23 additions & 0 deletions phpunit.xml.dist
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"
convertWarningsToExceptions="true"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
verbose="true"
>
<testsuites>
<testsuite name="Laravel-ACL Test Suite">
<directory suffix="Test.php">./tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist processUncoveredFilesFromWhitelist="true">
<directory suffix=".php">./src</directory>
</whitelist>
</filter>
</phpunit>

0 comments on commit 9848a11

Please sign in to comment.