diff --git a/.gitattributes b/.gitattributes index 16c2e89..7fa5527 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,7 +6,6 @@ /.editorconfig export-ignore /.gitattributes export-ignore /.gitignore export-ignore -/.scrutinizer.yml export-ignore /CHANGELOG.md export-ignore /infection.json.dist export-ignore /grumphp.yml export-ignore diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 5ebc01b..9feff58 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,10 +1,8 @@ # CONTRIBUTING -We're using [Travis CI](https://travis-ci.com) as a continuous integration system. - -For details, see [`.travis.yml`](../.travis.yml). - -## Tests +We're using [Github Actions](https://github.com/drupol/phpcsfixer-configs-php/actions) as a continuous integration system. + +For details, see [`workflows`](./.github/workflows). We're using [`grumphp/grumphp`](https://github.com/phpro/grumphp) to drive the development. diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 46ade6e..26323ed 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -49,9 +49,3 @@ jobs: - name: Run Grumphp run: vendor/bin/grumphp run - - - name: Send Scrutinizer data - run: | - wget https://scrutinizer-ci.com/ocular.phar - php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml - continue-on-error: true diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index 8662fd1..0000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,18 +0,0 @@ -build: - nodes: - analysis: - tests: - override: - - php-scrutinizer-run - -filter: - paths: - - 'src/*' - -tools: - external_code_coverage: - timeout: 600 - php_loc: true - php_pdepend: true - php_sim: true - php_changetracking: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 0322d61..cb063c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.21](https://github.com/drupol/phpcsfixer-configs-php/compare/2.0.20...2.0.21) + +### Merged + +- Issue [`#71`]: Update requirements for Drupal 11 compatibility. [`#72`](https://github.com/drupol/phpcsfixer-configs-php/pull/72) +- chore(deps): Bump shivammathur/setup-php from 2.29.0 to 2.30.5 [`#68`](https://github.com/drupol/phpcsfixer-configs-php/pull/68) +- Issue [`#61`]: Use string_implicit_backslashes instead of deprecated escape_implicit_backslashes. [`#62`](https://github.com/drupol/phpcsfixer-configs-php/pull/62) + +### Commits + +- Issue [`#71`]: Update requirements for Drupal 11 compatibility. [`def9fdd`](https://github.com/drupol/phpcsfixer-configs-php/commit/be3ce5919c2e40325c076c1de0d0a6319d018279) +- Update CI PHP version to fix Scrutinizer. [`e058439`](https://github.com/drupol/phpcsfixer-configs-php/commit/e0584396b522377a2f08451884e390dd709afc04) +- Issue [`#61`]: Use string_implicit_backslashes instead of deprecated escape_implicit_backslashes. [`be3ce59`](https://github.com/drupol/phpcsfixer-configs-php/commit/be3ce5919c2e40325c076c1de0d0a6319d018279) + ## [2.0.20](https://github.com/drupol/phpcsfixer-configs-php/compare/2.0.19...2.0.20) ### Merged diff --git a/README.md b/README.md index cd2b775..11e6204 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ Where the `$configs` parameters must implements `PhpCsFixer/ConfigInterface`. ## Requirements -* PHP >= 7.1.3 +* PHP >= 7.4 ## Installation @@ -50,7 +50,7 @@ See the [PHP CS Fixer documentation](https://github.com/FriendsOfPHP/PHP-CS-Fixe ## Code quality, tests and benchmarks -Every time changes are introduced into the library, [Github](https://github.com/drupol/phpcsfixer-configs-php/actions) run the tests and the benchmarks. +Every time changes are introduced into the library, [Github Actions](https://github.com/drupol/phpcsfixer-configs-php/actions) run the tests and the benchmarks. The library has tests written with [PHPSpec](http://www.phpspec.net/). Feel free to check them out in the `spec` directory. Run `composer phpspec` to trigger the tests. @@ -69,8 +69,6 @@ Feel free to contribute to this library by sending Github pull requests. I'm qui [github stars]: https://img.shields.io/github/stars/drupol/phpcsfixer-configs-php.svg?style=flat-square [total downloads]: https://img.shields.io/packagist/dt/drupol/phpcsfixer-configs-php.svg?style=flat-square [github workflow status]: https://img.shields.io/github/workflow/status/drupol/phpcsfixer-configs-php/Continuous%20Integration?style=flat-square -[code quality]: https://img.shields.io/scrutinizer/quality/g/drupol/phpcsfixer-configs-php/master.svg?style=flat-square -[3]: https://scrutinizer-ci.com/g/drupol/phpcsfixer-configs-php/?branch=master [4]: https://shepherd.dev/github/drupol/phpcsfixer-configs-php [license]: https://img.shields.io/packagist/l/drupol/phpcsfixer-configs-php.svg?style=flat-square [donate github]: https://img.shields.io/badge/Sponsor-Github-brightgreen.svg?style=flat-square diff --git a/composer.json b/composer.json index 4879e1d..23dce25 100644 --- a/composer.json +++ b/composer.json @@ -9,11 +9,26 @@ "email": "pol.dellaiera@protonmail.com" } ], + "funding": [ + { + "type": "github", + "url": "https://github.com/drupol" + } + ], "require": { "php": ">= 7.4", "friendsofphp/php-cs-fixer": "^3.49.0", "symfony/yaml": "^3 || ^4 || ^5 || ^6 || ^7" }, + "require-dev": { + "ext-pcov": "*", + "ergebnis/composer-normalize": "^2.31.0", + "friends-of-phpspec/phpspec-code-coverage": "^6", + "maglnet/composer-require-checker": "^4.4.0", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phpro/grumphp": "^1.0 || ^2.0", + "phpspec/phpspec": "^7" + }, "autoload": { "psr-4": { "drupol\\PhpCsFixerConfigsPhp\\": "./src/" @@ -25,27 +40,15 @@ } }, "config": { - "sort-packages": true, "allow-plugins": { + "ergebnis/composer-normalize": true, "phpro/grumphp": true - } - }, - "require-dev": { - "ext-pcov": "*", - "friends-of-phpspec/phpspec-code-coverage": "^6", - "php-parallel-lint/php-parallel-lint": "^1.3", - "phpro/grumphp": "1.1.* || 1.3.* || 1.4.* || 1.13.*", - "phpspec/phpspec": "^7" + }, + "sort-packages": true }, "scripts": { - "grumphp": "./vendor/bin/grumphp run", "changelog-unreleased": "auto-changelog -c .auto-changelog -u", - "changelog-version": "auto-changelog -c .auto-changelog -v" - }, - "funding": [ - { - "type": "github", - "url": "https://github.com/drupol" - } - ] + "changelog-version": "auto-changelog -c .auto-changelog -v", + "grumphp": "./vendor/bin/grumphp run" + } } diff --git a/grumphp.yml b/grumphp.yml index 020ac35..4ca3b07 100644 --- a/grumphp.yml +++ b/grumphp.yml @@ -12,4 +12,6 @@ grumphp: using_cache: false phpspec: verbose: true - + composer: ~ + composer_normalize: ~ + composer_require_checker: ~