Skip to content

CSFixer diff-format is always udiff since 3.0 #58

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 3, 2022
Merged

CSFixer diff-format is always udiff since 3.0 #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59c420a
CSFixer diff-format is always udiff since 3.0
rvanlaak Feb 3, 2022
9bdadcf
Update PHP-CSFixer config
rvanlaak Feb 3, 2022
37c06d5
Update Makefile as well
rvanlaak Feb 3, 2022
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/static-code-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Run PHP-CS-Fixer
uses: docker://jakzal/phpqa:php7.3-alpine
with:
args: php-cs-fixer fix --dry-run --diff-format udiff -vvv
args: php-cs-fixer fix --diff --dry-run -vvv

roave-bc-check:
name: Roave BC Check
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/.php-cs-fixer.cache
/build/
/composer.lock
/phpspec.yml
Expand Down
17 changes: 17 additions & 0 deletions .php-cs-fixer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?php

$finder = PhpCsFixer\Finder::create()
->exclude(__DIR__.'/vendor')
->name('*.php')
->in(__DIR__)
;

$config = new PhpCsFixer\Config();
return $config->setRules([
'@Symfony' => true,
'@Symfony:risky' => true,
'array_syntax' => ['syntax' => 'short'],
])
->setRiskyAllowed(true)
->setFinder($finder)
;
17 changes: 0 additions & 17 deletions .php_cs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ DIR := ${CURDIR}
QA_IMAGE := jakzal/phpqa:php7.3-alpine

cs-fix:
@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff -vvv
@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff -vvv

cs-diff:
@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff --dry-run -vvv
@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff --dry-run -vvv

phpstan:
@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) phpstan analyze
Expand Down