diff --git a/.php_cs b/.php_cs deleted file mode 100644 index c045e140..00000000 --- a/.php_cs +++ /dev/null @@ -1,64 +0,0 @@ -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 63c6bace..2916d7c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ All notable changes to `laravel-love` will be documented in this file. ## [Unreleased] +## [8.3.1] - 2020-03-06 + +### Added + +- ([#158]) Add Laravel 7.x support + ## [8.3.0] - 2020-02-16 ### Added @@ -422,7 +428,8 @@ Follow [upgrade instructions](UPGRADING.md#from-v5-to-v6) to migrate database to - Initial release -[Unreleased]: https://github.com/cybercog/laravel-love/compare/8.3.0...master +[Unreleased]: https://github.com/cybercog/laravel-love/compare/8.3.1...master +[8.3.1]: https://github.com/cybercog/laravel-love/compare/8.3.0...8.3.1 [8.3.0]: https://github.com/cybercog/laravel-love/compare/8.2.0...8.3.0 [8.2.0]: https://github.com/cybercog/laravel-love/compare/8.1.2...8.2.0 [8.1.2]: https://github.com/cybercog/laravel-love/compare/8.1.1...8.1.2 @@ -461,6 +468,7 @@ Follow [upgrade instructions](UPGRADING.md#from-v5-to-v6) to migrate database to [1.1.1]: https://github.com/cybercog/laravel-love/compare/1.1.0...1.1.1 [1.1.0]: https://github.com/cybercog/laravel-love/compare/1.0.0...1.1.0 +[#158]: https://github.com/cybercog/laravel-love/pull/158 [#151]: https://github.com/cybercog/laravel-love/pull/151 [#148]: https://github.com/cybercog/laravel-love/pull/148 [#147]: https://github.com/cybercog/laravel-love/pull/147 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e4977751..e1e3695c 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 c921c995..c3c941bc 100644 --- a/composer.json +++ b/composer.json @@ -47,15 +47,14 @@ }, "require": { "php": "^7.1.3", - "illuminate/database": "5.7.*|5.8.*|^6.0", - "illuminate/support": "5.7.*|5.8.*|^6.0" + "illuminate/database": "5.7.*|5.8.*|^6.0|^7.0", + "illuminate/support": "5.7.*|5.8.*|^6.0|^7.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^2.10", "mockery/mockery": "^1.0", - "orchestra/database": "~3.7.0|~3.8.0|^4.0", - "orchestra/testbench": "~3.7.0|~3.8.0|^4.0", - "phpunit/phpunit": "^7.5|^8.0" + "orchestra/database": "~3.7.0|~3.8.0|^4.0|^5.0", + "orchestra/testbench": "~3.7.0|~3.8.0|^4.0|^5.0", + "phpunit/phpunit": "^7.5|^8.0|^9.0" }, "autoload": { "psr-4": {