Skip to content

Commit

Permalink
Laravel 5.5 support (#1451)
Browse files Browse the repository at this point in the history
* 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 (#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
  • Loading branch information
thilanga committed Sep 20, 2017
1 parent 79c79e2 commit e897ae4
Show file tree
Hide file tree
Showing 14 changed files with 96 additions and 641 deletions.
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE.md
@@ -0,0 +1,28 @@
| Q | A
| ----------------- | ---
| Bug? | no|yes
| New Feature? | no|yes
| Framework | Laravel|Lumen
| Framework version | 5.x.y
| Package version | 1.x.y
| PHP version | 5.x.y|7.x.y

#### Actual Behaviour

Describe the behaviour you're experiencing. Do not just copy and paste a random error message and expect help.


#### Expected Behaviour

Describe the behaviour you're expecting.


#### Steps to Reproduce

List all the steps needed to reproduce the issue you're having. Make sure to include code (affected models, configurations),
any screenshots and/or other resources that may help us understand what's going on.


#### Possible Solutions

If you have any ideas on how to solve the issue, add them here, otherwise you can omit this part.
88 changes: 0 additions & 88 deletions .php_cs.dist

This file was deleted.

8 changes: 0 additions & 8 deletions .travis.yml
Expand Up @@ -17,17 +17,9 @@ cache:

matrix:
include:
- php: 5.5.9
env: setup=lowest
- php: 5.5.9
env: setup=stable
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.1
env: xdebug=false
- php: hhvm
env: xdebug=false

before_install:
- if [[ $xdebug = 'true' ]] ; then phpenv config-rm xdebug.ini; fi
Expand Down
13 changes: 5 additions & 8 deletions composer.json
Expand Up @@ -13,11 +13,11 @@
"email": "jason.lewis1991@gmail.com"
}],
"require": {
"php": "^5.5.9 || ^7.0",
"dingo/blueprint": "0.2.*",
"php": "^7.0",
"dingo/blueprint": "^0.2",
"illuminate/routing": "^5.1",
"illuminate/support": "^5.1",
"league/fractal": ">=0.12.0"
"league/fractal": "^0.17"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "~2",
Expand All @@ -29,15 +29,13 @@
"illuminate/filesystem": "^5.1",
"illuminate/log": "^5.1",
"illuminate/pagination": "^5.1",
"laravel/lumen-framework": "5.1.* || 5.2.*",
"lucadegasperi/oauth2-server-laravel": "5.0.*",
"laravel/lumen-framework": "^5.1",
"mockery/mockery": "~0.9",
"phpunit/phpunit": "^4.8 || ^5.0",
"squizlabs/php_codesniffer": "~2.0",
"tymon/jwt-auth": "1.0.*"
},
"suggest": {
"lucadegasperi/oauth2-server-laravel": "Protect your API with OAuth 2.0.",
"tymon/jwt-auth": "Protect your API with JSON Web Tokens."
},
"autoload": {
Expand All @@ -62,8 +60,7 @@
"Dingo\\Api\\Provider\\LaravelServiceProvider"
],
"aliases": {
"API": "Dingo\\Api\\Facade\\API",
"Route": "Dingo\\Api\\Facade\\Route"
"API": "Dingo\\Api\\Facade\\API"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/Auth/Provider/Basic.php
Expand Up @@ -27,7 +27,7 @@ class Basic extends Authorization
* Create a new basic provider instance.
*
* @param \Illuminate\Auth\AuthManager $auth
* @param string $identifier
* @param string $identifier
*
* @return void
*/
Expand Down
201 changes: 0 additions & 201 deletions src/Auth/Provider/OAuth2.php

This file was deleted.

0 comments on commit e897ae4

Please sign in to comment.