Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs: # Docs: <https://help.github.com/en/articles/workflow-syntax-for-github-ac
fail-fast: false
matrix:
setup: ['basic', 'lowest']
php: ['8.0', '8.1', '8.2']
php: ['8.0', '8.1', '8.2', '8.3', '8.4']
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].

## Unreleased

### Changed

- Use `PHP7x1Migration` rule instead of deprecated `PHP71Migration`
- Use `modifier_keywords` rule instead of deprecated `visibility_required`
- Minimal version of the package `friendsofphp/php-cs-fixer` now is `v3.90`

### Removed

- Obsolete `version` in `docker-compose.yml`

## v1.6.1

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM php:8.0-alpine
FROM php:8.4-alpine

ENV COMPOSER_HOME="/tmp/composer"

COPY --from=composer:2.5.5 /usr/bin/composer /usr/bin/composer
COPY --from=composer:2.9 /usr/bin/composer /usr/bin/composer

RUN set -x \
&& apk add --no-cache git \
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
],
"require": {
"php": "^8.0",
"friendsofphp/php-cs-fixer": "^v3.54.0"
"friendsofphp/php-cs-fixer": "^v3.90"
},
"require-dev": {
"phpstan/phpstan": "^1.10"
"phpstan/phpstan": "^1.12"
},
"scripts": {
"phpstan": "@php ./vendor/bin/phpstan analyze -c ./phpstan.neon.dist --no-progress --ansi",
Expand Down
8 changes: 4 additions & 4 deletions cs_rules.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
* @see https://mlocati.github.io/php-cs-fixer-configurator/
*/
return [
'@PSR12' => true,
'@PHP71Migration' => true,
'binary_operator_spaces' => [
'@PSR12' => true,
'@PHP7x1Migration' => true,
'binary_operator_spaces' => [
'operators' => [
'=' => 'align_single_space',
'=>' => 'align_single_space',
Expand Down Expand Up @@ -97,7 +97,7 @@
'unary_operator_spaces' => true,
'void_return' => true,
'ternary_to_null_coalescing' => true,
'visibility_required' => true,
'modifier_keywords' => ['elements' => ['const', 'method', 'property']],
'whitespace_after_comma_in_array' => true,
'ordered_imports' => [
'sort_algorithm' => 'length',
Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '3.2'

volumes:
composer-data:

Expand Down