Skip to content

Commit

Permalink
Merge branch 'aguinaldotupy/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
breart committed Jul 1, 2020
2 parents 7d2b02c + 073425e commit 2ce1635
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [2.0.3] - 2020-07-01
- Support for Laravel 7 (#4)
- Add branch-aliases in composer.json

## [2.0.2] - 2020-03-24

### Fixed
Expand Down Expand Up @@ -79,12 +83,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Replaced underscores with dots in routes
- Minor refactoring, formatting

[Unreleased]: https://github.com/24Slides/laravel-saml2/compare/2.0.2...HEAD
[Unreleased]: https://github.com/24Slides/laravel-saml2/compare/2.0.3...HEAD
[2.0.3]: https://github.com/24Slides/laravel-saml2/compare/2.0.2...2.0.3
[2.0.2]: https://github.com/24Slides/laravel-saml2/compare/2.0.1...2.0.2
[2.0.1]: https://github.com/24Slides/laravel-saml2/compare/2.0.0...2.0.1
[2.0.0]: https://github.com/24Slides/laravel-saml2/compare/1.2.0...2.0.0
[1.2.0]: https://github.com/24Slides/laravel-saml2/compare/1.1.3...1.2.0
[1.1.3]: https://github.com/24Slides/laravel-saml2/compare/1.1.2...1.1.3
[1.1.2]: https://github.com/24Slides/laravel-saml2/compare/1.1.1...1.1.2
[1.1.1]: https://github.com/24Slides/laravel-saml2/compare/1.1.0...1.1.1
[1.1.0]: https://github.com/24Slides/laravel-saml2/compare/1.0.0...1.1.0
[1.1.0]: https://github.com/24Slides/laravel-saml2/compare/1.0.0...1.1.0
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Event::listen(\Slides\Saml2\Events\SignedIn::class, function (\Slides\Saml2\Even

To define a middleware for default routes, add its name to `config/saml2.php`:

```
```php
/*
|--------------------------------------------------------------------------
| Built-in routes prefix
Expand Down
9 changes: 6 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"require": {
"php": ">=7.1",
"ext-openssl": "*",
"illuminate/support": "~5.4|^6.0",
"illuminate/database": "~5.5|^6.0",
"illuminate/console": "~5.5|^6.0",
"illuminate/console": "~5.5|^6.0|^7.0",
"illuminate/database": "~5.5|^6.0|^7.0",
"illuminate/support": "~5.4|^6.0|^7.0",
"onelogin/php-saml": "^3.0",
"ramsey/uuid": "^3.8"
},
Expand All @@ -41,6 +41,9 @@
"providers": [
"Slides\\Saml2\\ServiceProvider"
]
},
"branch-aliases": {
"dev-master": "2.0.3-dev"
}
},
"minimum-stability": "dev",
Expand Down

0 comments on commit 2ce1635

Please sign in to comment.