Skip to content

Commit

Permalink
Merge pull request #358 from ergebnis/fix/fixture
Browse files Browse the repository at this point in the history
Fix: Run `friendsofphp/php-cs-fixer` on fixtures
  • Loading branch information
localheinz authored Nov 8, 2021
2 parents 998cd88 + 6637f07 commit 5f78aa4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ jobs:
- name: "Run friendsofphp/php-cs-fixer"
run: "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --dry-run --verbose"

- name: "Run friendsofphp/php-cs-fixer on fixtures"
run: "vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.fixture.php --diff --diff-format=udiff --dry-run --verbose"

dependency-analysis:
name: "Dependency Analysis"

Expand Down
5 changes: 3 additions & 2 deletions .php-cs-fixer.fixture.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@
'final_internal_class' => false,
'final_public_method_for_abstract_class' => false,
'header_comment' => false,
'lowercase_constants' => false,
'lowercase_keywords' => false,
'magic_method_casing' => false,
'protected_to_private' => false,
'static_lambda' => false,
]);

$config->getFinder()->in(__DIR__ . '/test/Fixture');
$config->getFinder()
->in(__DIR__ . '/test/Fixture')
->notPath('Classes/PHPUnit/Framework/TestCaseWithSuffixRule/Success/ImplicitlyAbstractTestCase.php');

$config->setCacheFile(__DIR__ . '/.build/php-cs-fixer/.php_cs.fixture.cache');

Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-norm
yamllint -c .yamllint.yaml --strict .
mkdir -p .build/php-cs-fixer
vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.php --diff --diff-format=udiff --verbose
vendor/bin/php-cs-fixer fix --config=.php-cs-fixer.fixture.php --diff --diff-format=udiff --verbose

.PHONY: dependency-analysis
dependency-analysis: vendor ## Runs a dependency analysis with maglnet/composer-require-checker
Expand Down

0 comments on commit 5f78aa4

Please sign in to comment.