Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Laravel 5.6 support #18

Merged
merged 1 commit into from
Feb 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to `laravel-ban` will be documented in this file.

## [3.1.0] - 2018-02-08

### Added

- Laravel 5.6 support ([#18](https://github.com/cybercog/laravel-ban/pull/18))

## [3.0.0] - 2017-08-27

### Added
Expand Down Expand Up @@ -57,6 +63,7 @@ All notable changes to `laravel-ban` will be documented in this file.

- Initial release

[3.1.0]: https://github.com/cybercog/laravel-ban/compare/3.0.0...3.1.0
[3.0.0]: https://github.com/cybercog/laravel-ban/compare/2.1.1...3.0.0
[2.1.0]: https://github.com/cybercog/laravel-ban/compare/2.0.1...2.1.0
[2.0.1]: https://github.com/cybercog/laravel-ban/compare/2.0.0...2.0.1
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2017, Anton Komarev <a.komarev@cybercog.su>
Copyright (c) 2018, Anton Komarev <a.komarev@cybercog.su>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Use case is not limited to User model, any Eloquent model could be banned: Organ
- [Events](#events)
- [Middleware](#middleware)
- [Scheduling](#scheduling)
- [Change log](#change-log)
- [Changelog](#changelog)
- [Upgrading](#upgrading)
- [Contributing](#contributing)
- [Testing](#testing)
Expand Down Expand Up @@ -282,7 +282,7 @@ protected function schedule(Schedule $schedule)

Of course, the time used in the code above is just example. Adjust it to suit your own preferences.

## Change log
## Changelog

Please see [CHANGELOG](CHANGELOG.md) for more information on what has changed recently.

Expand All @@ -299,7 +299,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
Run the tests with:

```sh
$ composer test
$ vendor/bin/phpunit
```

## Security
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@
},
"require": {
"php": "^5.6|^7.0",
"illuminate/database": "~5.1.20|~5.2|~5.3|~5.4|~5.5",
"illuminate/events": "~5.1.20|~5.2|~5.3|~5.4|~5.5",
"illuminate/support": "~5.1.20|~5.2|~5.3|~5.4|~5.5"
"illuminate/database": "~5.1.20|~5.2|~5.3|~5.4|~5.5|~5.6",
"illuminate/events": "~5.1.20|~5.2|~5.3|~5.4|~5.5|~5.6",
"illuminate/support": "~5.1.20|~5.2|~5.3|~5.4|~5.5|~5.6"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^1.11",
"friendsofphp/php-cs-fixer": "^2.10",
"mockery/mockery": "^0.9.8",
"orchestra/database": "~3.4.0|~3.5.0",
"orchestra/testbench": "~3.4.0|~3.5.0",
"phpunit/phpunit": "^5.7|^6.0"
"orchestra/database": "~3.4.0|~3.5.0|~3.6.0",
"orchestra/testbench": "~3.4.0|~3.5.0|~3.6.0",
"phpunit/phpunit": "^5.7|^6.0|^7.0"
},
"autoload": {
"psr-4": {
Expand Down