Merge pull request #18 from cybercog/feature/laravel-5.6-support

Add Laravel 5.6 support
cybercog · Feb 8, 2018 · 95547df · 95547df
2 parents b1caed8 + bfda371
commit 95547df
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
@@ -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

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017, Anton Komarev <[email protected]>
+Copyright (c) 2018, Anton Komarev <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -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)
@@ -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.
 
@@ -299,7 +299,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 Run the tests with:
 
 ```sh
-$ composer test
+$ vendor/bin/phpunit
 ```
 
 ## Security

diff --git a/composer.json b/composer.json
@@ -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": {