From e67ba73dc960a48886d03cec8f796c8b22574834 Mon Sep 17 00:00:00 2001 From: antonkomarev Date: Fri, 1 Jan 2021 16:45:33 +0300 Subject: [PATCH] Add PHP8 support --- .gitattributes | 1 - .github/FUNDING.yml | 1 - .gitignore | 1 - .php_cs | 64 --------------------------------------------- .travis.yml | 1 + CHANGELOG.md | 16 +++++++++++- CONTRIBUTING.md | 14 +++++----- README.md | 6 ++--- composer.json | 2 +- 9 files changed, 28 insertions(+), 78 deletions(-) delete mode 100644 .github/FUNDING.yml 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/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index dfab535..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -custom: https://paypal.me/antonkomarev diff --git a/.gitignore b/.gitignore index 4246596..f2cb7f8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ vendor/ -.php_cs.cache composer.lock composer.phar phpunit.xml diff --git a/.php_cs b/.php_cs deleted file mode 100644 index c045e14..0000000 --- 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/.travis.yml b/.travis.yml index 172b670..17966df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ php: - 7.2 - 7.3 - 7.4 + - 8.0 env: global: diff --git a/CHANGELOG.md b/CHANGELOG.md index 11c741d..acf93b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,18 @@ All notable changes to `cybercog/laravel-nova-ban` will be documented in this fi ## [Unreleased] +## [1.2.0] - 2021-01-01 + +### Added + +- Added PHP 8.x support + +## [1.1.1] - 2020-03-11 + +### Fixed + +- ([#9]) Removed unused `symfony/process` dependency + ## [1.1.0] - 2019-02-26 ### Added @@ -14,5 +26,7 @@ All notable changes to `cybercog/laravel-nova-ban` will be documented in this fi - Initial release -[Unreleased]: https://github.com/cybercog/laravel-ban/compare/1.1.0...master +[Unreleased]: https://github.com/cybercog/laravel-ban/compare/1.2.0...master +[1.2.0]: https://github.com/cybercog/laravel-ban/compare/1.1.1...1.2.0 +[1.1.1]: https://github.com/cybercog/laravel-ban/compare/1.1.0...1.1.1 [1.1.0]: https://github.com/cybercog/laravel-ban/compare/1.0.0...1.1.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 542e04e..1d0cb9e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,11 +19,8 @@ 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 package attempts to comply with [PSR-4] autoloader, [PSR-1] basic coding standard and [PSR-12] coding style guide. +If you notice compliance oversights, please send a patch via pull request. ## PHPUnit tests @@ -35,4 +32,9 @@ $ vendor/bin/phpunit ## Reporting issues -- [General problems](https://github.com/cybercog/laravel-nova-ban/issues) +- [General problems] + +[PSR-1]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md +[PSR-4]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md +[PSR-12]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-12-extended-coding-style-guide.md +[General problems]: https://github.com/cybercog/laravel-nova-ban/issues diff --git a/README.md b/README.md index bd08d77..984f40b 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Behind the scenes [cybercog/laravel-ban](https://github.com/cybercog/laravel-ban ## Installation -First, pull in the package through Composer: +Pull in the package through Composer. ```shell script $ composer require cybercog/laravel-nova-ban @@ -139,11 +139,11 @@ If you discover any security related issues, please email open@cybercog.su inste ## About CyberCog -[CyberCog](https://cybercog.su) is a Social Unity of enthusiasts. Research best solutions in product & software development is our passion. +[CyberCog] is a Social Unity of enthusiasts. Research best solutions in product & software development is our passion. - [Follow us on Twitter](https://twitter.com/cybercog) -- [Read our articles on Medium](https://medium.com/cybercog) CyberCog [Anton Komarev]: https://komarev.com +[CyberCog]: https://cybercog.su diff --git a/composer.json b/composer.json index 94ac2cd..d39eae3 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,7 @@ "docs": "https://github.com/cybercog/laravel-nova-ban/wiki" }, "require": { - "php": "^7.1.3", + "php": "^7.1.3|^8.0", "laravel/nova": "*", "cybercog/laravel-ban": "^3.0|^4.0" },