Skip to content

Commit e897ae4

Browse files
authored
Laravel 5.5 support (dingo#1451)
* Refactored the code to be more visible and readble * Removed Third parameter is callback and fourth is null check as the third parameter is only accept array * Align and indent code to fix the StyleCI errors * Fixed compatible issues with StyleCI * Fix Laravel 5.5 compatibility with "getDomain" Fix a bug with Laravel 5.5 (dingo#1413 (comment)) * Fix typo * Added github issue template * Changed the OAuth package * Added github new issue template * Extended form Illuminate route class * Fixed code formatting * Removed router form alias * Trying to fix StyleCI issue * Apply fixes from StyleCI * Updated the minimum php version and fractal * Added empty array as register signature needs an array as third parameter * Fixed the comment line * Fixed indenting * Removed php 5x support * Removed broken OAuth2 provider * Apply fixes from StyleCI * Removed HHVM form travis file
1 parent 79c79e2 commit e897ae4

File tree

14 files changed

+96
-641
lines changed

14 files changed

+96
-641
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
| Q | A
2+
| ----------------- | ---
3+
| Bug? | no|yes
4+
| New Feature? | no|yes
5+
| Framework | Laravel|Lumen
6+
| Framework version | 5.x.y
7+
| Package version | 1.x.y
8+
| PHP version | 5.x.y|7.x.y
9+
10+
#### Actual Behaviour
11+
12+
Describe the behaviour you're experiencing. Do not just copy and paste a random error message and expect help.
13+
14+
15+
#### Expected Behaviour
16+
17+
Describe the behaviour you're expecting.
18+
19+
20+
#### Steps to Reproduce
21+
22+
List all the steps needed to reproduce the issue you're having. Make sure to include code (affected models, configurations),
23+
any screenshots and/or other resources that may help us understand what's going on.
24+
25+
26+
#### Possible Solutions
27+
28+
If you have any ideas on how to solve the issue, add them here, otherwise you can omit this part.

.php_cs.dist

Lines changed: 0 additions & 88 deletions
This file was deleted.

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,9 @@ cache:
1717

1818
matrix:
1919
include:
20-
- php: 5.5.9
21-
env: setup=lowest
22-
- php: 5.5.9
23-
env: setup=stable
24-
- php: 5.5
25-
- php: 5.6
2620
- php: 7.0
2721
- php: 7.1
2822
env: xdebug=false
29-
- php: hhvm
30-
env: xdebug=false
3123

3224
before_install:
3325
- if [[ $xdebug = 'true' ]] ; then phpenv config-rm xdebug.ini; fi

composer.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"email": "[email protected]"
1414
}],
1515
"require": {
16-
"php": "^5.5.9 || ^7.0",
17-
"dingo/blueprint": "0.2.*",
16+
"php": "^7.0",
17+
"dingo/blueprint": "^0.2",
1818
"illuminate/routing": "^5.1",
1919
"illuminate/support": "^5.1",
20-
"league/fractal": ">=0.12.0"
20+
"league/fractal": "^0.17"
2121
},
2222
"require-dev": {
2323
"friendsofphp/php-cs-fixer": "~2",
@@ -29,15 +29,13 @@
2929
"illuminate/filesystem": "^5.1",
3030
"illuminate/log": "^5.1",
3131
"illuminate/pagination": "^5.1",
32-
"laravel/lumen-framework": "5.1.* || 5.2.*",
33-
"lucadegasperi/oauth2-server-laravel": "5.0.*",
32+
"laravel/lumen-framework": "^5.1",
3433
"mockery/mockery": "~0.9",
3534
"phpunit/phpunit": "^4.8 || ^5.0",
3635
"squizlabs/php_codesniffer": "~2.0",
3736
"tymon/jwt-auth": "1.0.*"
3837
},
3938
"suggest": {
40-
"lucadegasperi/oauth2-server-laravel": "Protect your API with OAuth 2.0.",
4139
"tymon/jwt-auth": "Protect your API with JSON Web Tokens."
4240
},
4341
"autoload": {
@@ -62,8 +60,7 @@
6260
"Dingo\\Api\\Provider\\LaravelServiceProvider"
6361
],
6462
"aliases": {
65-
"API": "Dingo\\Api\\Facade\\API",
66-
"Route": "Dingo\\Api\\Facade\\Route"
63+
"API": "Dingo\\Api\\Facade\\API"
6764
}
6865
}
6966
},

src/Auth/Provider/Basic.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class Basic extends Authorization
2727
* Create a new basic provider instance.
2828
*
2929
* @param \Illuminate\Auth\AuthManager $auth
30-
* @param string $identifier
30+
* @param string $identifier
3131
*
3232
* @return void
3333
*/

src/Auth/Provider/OAuth2.php

Lines changed: 0 additions & 201 deletions
This file was deleted.

0 commit comments

Comments
 (0)