Skip to content

Commit a5bfbf8

Browse files
author
Anton Komarev
authored
Merge pull request #35 from cybercog/feature/laravel-5.6-support
Add Laravel 5.6 support
2 parents 73a96dc + b3b1da3 commit a5bfbf8

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

.styleci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ disabled:
55
- phpdoc_no_package
66
- logical_not_operators_with_successor_space
77
- length_ordered_imports
8+
- simplified_null_return

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
All notable changes to `laravel-eloquent-flag` will be documented in this file.
44

5+
## [3.13.0] - 2018-02-08
6+
7+
### Added
8+
9+
- Laravel 5.6 support.
10+
511
## [3.12.0] - 2017-09-09
612

713
### Added
@@ -151,6 +157,7 @@ All notable changes to `laravel-eloquent-flag` will be documented in this file.
151157

152158
- `is_active` boolean flag added.
153159

160+
[3.13.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.12.0...3.13.0
154161
[3.12.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.11.0...3.12.0
155162
[3.11.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.10.0...3.11.0
156163
[3.10.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/3.9.0...3.10.0

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017, Anton Komarev <[email protected]>
3+
Copyright (c) 2018, Anton Komarev <[email protected]>
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Eloquent boolean & timestamp flagged attributes behavior. Enhance eloquent model
1818
- [How it works](#how-it-works)
1919
- [Installation](#installation)
2020
- [Usage](#usage)
21-
- [Change log](#change-log)
21+
- [Changelog](#changelog)
2222
- [Upgrading](#upgrading)
2323
- [Contributing](#contributing)
2424
- [Testing](#testing)
@@ -108,7 +108,7 @@ And then include the service provider within `app/config/app.php`.
108108

109109
[Usage examples described in Wiki](https://github.com/cybercog/laravel-eloquent-flag/wiki/usage)
110110

111-
## Change log
111+
## Changelog
112112

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

composer.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,13 @@
5454
},
5555
"require": {
5656
"php": "^5.6|^7.0",
57-
"illuminate/database": "~5.2.0|~5.3.0|~5.4.0|~5.5.0"
57+
"illuminate/database": "~5.2.0|~5.3.0|~5.4.0|~5.5.0|~5.6.0"
5858
},
5959
"require-dev": {
60-
"friendsofphp/php-cs-fixer": "^1.11",
61-
"mockery/mockery": "^0.9.8",
62-
"orchestra/database": "~3.4.0|~3.5.0",
63-
"orchestra/testbench": "~3.4.0|~3.5.0",
64-
"phpunit/phpunit": "^5.7|^6.2"
60+
"friendsofphp/php-cs-fixer": "^2.10",
61+
"orchestra/database": "~3.4.0|~3.5.0|~3.6.0",
62+
"orchestra/testbench": "~3.4.0|~3.5.0|~3.6.0",
63+
"phpunit/phpunit": "^5.7|^6.2|^7.0"
6564
},
6665
"autoload": {
6766
"psr-4": {

0 commit comments

Comments
 (0)