Skip to content

Commit

Permalink
Add Laravel 7.x support (#65)
Browse files Browse the repository at this point in the history
Add Laravel 7.x support
  • Loading branch information
antonkomarev authored Mar 6, 2020
1 parent 8466523 commit e89586e
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 77 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
/tests export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.php_cs export-ignore
/.styleci.yml export-ignore
/.travis.yml export-ignore
/CODE_OF_CONDUCT.md export-ignore
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
.idea/
vendor/
.php_cs.cache
.phpunit.result.cache
composer.lock
composer.phar
Expand Down
64 changes: 0 additions & 64 deletions .php_cs

This file was deleted.

10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to `cybercog/laravel-eloquent-flag` will be documented in th

## [Unreleased]

## [5.1.2] - 2020-03-06

### Added

- ([#65]) Add Laravel 7.x support

## [5.1.1] - 2020-02-20

### Fixed
Expand Down Expand Up @@ -278,7 +284,8 @@ All notable changes to `cybercog/laravel-eloquent-flag` will be documented in th

- `is_active` boolean flag added.

[Unreleased]: https://github.com/cybercog/laravel-eloquent-flag/compare/5.1.1...master
[Unreleased]: https://github.com/cybercog/laravel-eloquent-flag/compare/5.1.2...master
[5.1.2]: https://github.com/cybercog/laravel-eloquent-flag/compare/5.1.1...5.1.2
[5.1.1]: https://github.com/cybercog/laravel-eloquent-flag/compare/5.1.0...5.1.1
[5.1.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/5.0.0...5.1.0
[5.0.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/4.0.0...5.0.0
Expand All @@ -305,6 +312,7 @@ All notable changes to `cybercog/laravel-eloquent-flag` will be documented in th
[1.2.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/1.1.0...1.2.0
[1.1.0]: https://github.com/cybercog/laravel-eloquent-flag/compare/1.0.0...1.1.0

[#65]: https://github.com/cybercog/laravel-eloquent-flag/pull/65
[#62]: https://github.com/cybercog/laravel-eloquent-flag/pull/62
[#59]: https://github.com/cybercog/laravel-eloquent-flag/pull/59
[#56]: https://github.com/cybercog/laravel-eloquent-flag/pull/56
Expand Down
6 changes: 1 addition & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,7 @@ Due to time constraints, we are not always able to respond as quickly as we woul

## Coding Guidelines

This project comes with a configuration file for php-cs-fixer (.php_cs) that you can use to (re)format your sourcecode for compliance with this project's coding guidelines:

```shell script
$ vendor/bin/php-cs-fixer fix
```
This project follows [PSR-12 coding style guide](https://www.php-fig.org/psr/psr-12/).

## PHPUnit tests

Expand Down
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,13 @@
},
"require": {
"php": "^7.1.3",
"illuminate/database": "5.8.*|^6.0"
"illuminate/database": "^5.8|^6.0|^7.0"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^2.10",
"mockery/mockery": "^1.0",
"orchestra/database": "~3.8.0|^4.0",
"orchestra/testbench": "~3.8.0|^4.0",
"phpunit/phpunit": "^7.0|^8.0"
"orchestra/database": "~3.8.0|^4.0|^5.0",
"orchestra/testbench": "~3.8.0|^4.0|^5.0",
"phpunit/phpunit": "^7.0|^8.0|^9.0"
},
"autoload": {
"psr-4": {
Expand Down

2 comments on commit e89586e

@dustinh07
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

T

@antonkomarev
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Please sign in to comment.