From e89586e37d6692904513840f01d5277e3fc3e149 Mon Sep 17 00:00:00 2001
From: Anton Komarev <1849174+antonkomarev@users.noreply.github.com>
Date: Sat, 7 Mar 2020 00:14:14 +0300
Subject: [PATCH] Add Laravel 7.x support (#65)

Add Laravel 7.x support
---
 .gitattributes  |  1 -
 .gitignore      |  1 -
 .php_cs         | 64 -------------------------------------------------
 CHANGELOG.md    | 10 +++++++-
 CONTRIBUTING.md |  6 +----
 composer.json   |  9 ++++---
 6 files changed, 14 insertions(+), 77 deletions(-)
 delete mode 100644 .php_cs

diff --git a/.gitattributes b/.gitattributes
index 3073007..57add99 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -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
diff --git a/.gitignore b/.gitignore
index bb5ad85..e0f5627 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .idea/
 vendor/
-.php_cs.cache
 .phpunit.result.cache
 composer.lock
 composer.phar
diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index c045e14..0000000
--- a/.php_cs
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-$finder = Symfony\Component\Finder\Finder::create()
-    ->notPath('bootstrap/cache')
-    ->notPath('storage')
-    ->notPath('vendor')
-    ->in(__DIR__)
-    ->name('*.php')
-    ->ignoreDotFiles(true)
-    ->ignoreVCS(true);
-
-$fixers = [
-    '-psr0',
-    '-php_closing_tag',
-    'blankline_after_open_tag',
-    '-concat_without_spaces',
-    'double_arrow_multiline_whitespaces',
-    'duplicate_semicolon',
-    'empty_return',
-    'extra_empty_lines',
-    'include',
-    'join_function',
-    'list_commas',
-    'multiline_array_trailing_comma',
-    'namespace_no_leading_whitespace',
-    'newline_after_open_tag',
-    'no_blank_lines_after_class_opening',
-    'no_empty_lines_after_phpdocs',
-    'object_operator',
-    'operators_spaces',
-    'phpdoc_indent',
-    'phpdoc_no_access',
-    '-phpdoc_no_package',
-    'phpdoc_scalar',
-    'phpdoc_short_description',
-    'phpdoc_to_comment',
-    'phpdoc_trim',
-    'phpdoc_type_to_var',
-    'phpdoc_var_without_name',
-    'remove_leading_slash_use',
-    'remove_lines_between_uses',
-    'return',
-    'self_accessor',
-    'single_array_no_trailing_comma',
-    'single_blank_line_before_namespace',
-    'single_quote',
-    'spaces_before_semicolon',
-    'spaces_cast',
-    'standardize_not_equal',
-    'ternary_spaces',
-    'trim_array_spaces',
-    'unalign_equals',
-    'unary_operators_spaces',
-    'whitespacy_lines',
-    'multiline_spaces_before_semicolon',
-    'short_array_syntax',
-    'short_echo_tag',
-];
-
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
-    ->fixers($fixers)
-    ->finder($finder)
-    ->setUsingCache(true);
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b428d31..9013b7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
@@ -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
@@ -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
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 95399d4..4e4ac21 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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
 
diff --git a/composer.json b/composer.json
index 87b9023..dde9224 100644
--- a/composer.json
+++ b/composer.json
@@ -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": {