Skip to content
This repository was archived by the owner on Jan 29, 2024. It is now read-only.

Commit 1a935f1

Browse files
author
Mateus Junges
authored
Merge pull request #164 from mateusjunges/laravel/7.x
Add laravel support for 7.x
2 parents 309bbfb + aa4054f commit 1a935f1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+145
-156
lines changed

‎.travis.yml‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,31 @@ matrix:
44
fast_finish: true
55
include:
66
- php: 7.2
7-
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-lowest'
7+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest' IGNITION='1.*'
88
- php: 7.2
9-
env: LARAVEL='5.6.*' TESTBENCH='3.6.*' COMPOSER_FLAGS='--prefer-stable'
9+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
1010
- php: 7.2
11-
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
11+
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
1212
- 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'
13+
env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='2.*'
1814
- php: 7.3
19-
env: LARAVEL='5.7.*' TESTBENCH='3.7.*' COMPOSER_FLAGS='--prefer-stable'
15+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest' IGNITION='1.*'
2016
- php: 7.3
21-
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-lowest'
17+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
2218
- php: 7.3
23-
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable'
19+
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-lowest' IGNITION='1.*'
2420
- 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-
37-
allow_failures:
38-
- php: 7.4snapshot
21+
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
22+
- php: 7.4
23+
env: LARAVEL='5.8.*' TESTBENCH='3.8.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
24+
- php: 7.4
25+
env: LARAVEL='6.*' TESTBENCH='4.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='1.*'
26+
- php: 7.4
27+
env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable' IGNITION='2.*'
3928

4029
before_install:
4130
- travis_retry composer self-update
31+
- travis_retry composer require --no-update --no-interaction "facade/ignition:${IGNITION}" --dev
4232
- travis_retry composer require --no-update --no-interaction "laravel/framework:${LARAVEL}" "orchestra/testbench:${TESTBENCH}"
4333

4434
install:

‎CHANGELOG.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22

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

5-
# **Not Released**
5+
6+
# 2.4.0
67
- Changed public method `getCorrectParameter` to `private` on `GroupsTrait` and `UsersTrait`
78
- Improved documentations
8-
9+
- Drop support for Laravel v5.6
10+
- Drop support for Laravel v5.7
11+
- Add support for Laravel v7.x
912

1013
# 2.3.0
1114
- Added `syncGroups()` method on users trait. [#155](https://github.com/mateusjunges/laravel-acl/issues/155)

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111

1212
# Laravel ACL
1313

14-
This package allows you to manage user permissions and groups in a database.
14+
This package allows you to manage user permissions and groups in a database,
15+
and is compatible with Laravel v5.8 or higher.
1516
Please check the [documentations](https://mateusjunges.github.io/laravel-acl).
1617

1718
# Tests

‎composer.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,22 @@
1010
"permissions",
1111
"access-control-list"
1212
],
13+
"support": {
14+
"issues": "https://github.com/mateusjunges/laravel-acl/issues",
15+
"source": "https://github.com/mateusjunges/laravel-acl"
16+
},
1317
"homepage": "https://github.com/mateusjunges/laravel-acl",
1418
"require": {
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",
19+
"php": "^7.2.5",
20+
"illuminate/auth": "^5.8|^6.0|^7.0",
21+
"illuminate/support": "^5.8|^6.0|^7.0",
22+
"illuminate/database": "^5.8|^6.0|^7.0",
1923
"facade/ignition-contracts": "^1.0"
2024
},
2125
"require-dev": {
22-
"orchestra/testbench": "^3.6|^3.7|^3.8",
23-
"phpunit/phpunit": "^7.0|^8.0",
24-
"predis/predis": "^1.1",
25-
"facade/ignition": "^1.4"
26+
"orchestra/testbench": "^3.8|^4.0|^5.0",
27+
"phpunit/phpunit": "^8.0|^9.0",
28+
"predis/predis": "^1.1"
2629
},
2730
"suggest": {
2831
"facade/igntion": "Needed to be able to use the ignition solutions for laravel-acl"

‎docs/.vuepress/dist/404.html‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
<meta name="viewport" content="width=device-width,initial-scale=1">
66
<title>Laravel ACL</title>
77
<meta name="description" content="Manage user permissions and groups">
8+
<meta name="generator" content="VuePress 1.3.1">
89
<link rel="shortcut icon" href="/laravel-acl/favicon.ico">
910

10-
<link rel="preload" href="/laravel-acl/assets/css/0.styles.0b234471.css" as="style"><link rel="preload" href="/laravel-acl/assets/js/app.c2964f56.js" as="script"><link rel="preload" href="/laravel-acl/assets/js/5.927064d4.js" as="script"><link rel="prefetch" href="/laravel-acl/assets/js/2.e51dc901.js"><link rel="prefetch" href="/laravel-acl/assets/js/3.08d255c3.js"><link rel="prefetch" href="/laravel-acl/assets/js/4.34517fad.js"><link rel="prefetch" href="/laravel-acl/assets/js/6.8ed389a9.js"><link rel="prefetch" href="/laravel-acl/assets/js/7.7072502d.js"><link rel="prefetch" href="/laravel-acl/assets/js/8.41e0811b.js"><link rel="prefetch" href="/laravel-acl/assets/js/9.0cc5bf5a.js">
11-
<link rel="stylesheet" href="/laravel-acl/assets/css/0.styles.0b234471.css">
11+
<link rel="preload" href="/laravel-acl/assets/css/0.styles.8095ea24.css" as="style"><link rel="preload" href="/laravel-acl/assets/js/app.a218e7fa.js" as="script"><link rel="preload" href="/laravel-acl/assets/js/4.b2c0328d.js" as="script"><link rel="prefetch" href="/laravel-acl/assets/js/2.303f5113.js"><link rel="prefetch" href="/laravel-acl/assets/js/3.e977176a.js"><link rel="prefetch" href="/laravel-acl/assets/js/5.fc275d82.js"><link rel="prefetch" href="/laravel-acl/assets/js/6.f89567bb.js"><link rel="prefetch" href="/laravel-acl/assets/js/7.869ae31f.js"><link rel="prefetch" href="/laravel-acl/assets/js/8.0152cbfd.js">
12+
<link rel="stylesheet" href="/laravel-acl/assets/css/0.styles.8095ea24.css">
1213
</head>
1314
<body>
14-
<div id="app" data-server-rendered="true"><div class="theme-container"><div class="theme-default-content"><h1>404</h1> <blockquote>That's a Four-Oh-Four.</blockquote> <a href="/laravel-acl/" class="router-link-active">Take me home.</a></div></div><div class="global-ui"></div></div>
15-
<script src="/laravel-acl/assets/js/app.c2964f56.js" defer></script><script src="/laravel-acl/assets/js/5.927064d4.js" defer></script>
15+
<div id="app" data-server-rendered="true"><div class="theme-container"><div class="theme-default-content"><h1>404</h1> <blockquote>There's nothing here.</blockquote> <a href="/laravel-acl/" class="router-link-active">
16+
Take me home.
17+
</a></div></div><div class="global-ui"></div></div>
18+
<script src="/laravel-acl/assets/js/app.a218e7fa.js" defer></script><script src="/laravel-acl/assets/js/4.b2c0328d.js" defer></script>
1619
</body>
1720
</html>

‎docs/.vuepress/dist/assets/css/0.styles.0b234471.css‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎docs/.vuepress/dist/assets/css/0.styles.8095ea24.css‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/.vuepress/dist/assets/img/database-model.6ef27c9a.png‎

-55.8 KB
Binary file not shown.

‎docs/.vuepress/dist/assets/js/2.303f5113.js‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/.vuepress/dist/assets/js/2.e51dc901.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)