Skip to content

Commit 5dd974e

Browse files
authored
Merge pull request #78 from itk-dev/chore/update-deps-fix-deprecations
chore: update composer dependencies, fix php-cs-fixer deprecation
2 parents 7ca65cf + e276696 commit 5dd974e

4 files changed

Lines changed: 176 additions & 170 deletions

File tree

.php-cs-fixer.dist.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414

1515
$config = new PhpCsFixer\Config();
1616
$config->setFinder($finder);
17+
// Allow running on PHP versions php-cs-fixer doesn't officially support yet
18+
// (we run on the latest stable PHP). Replaces the deprecated
19+
// PHP_CS_FIXER_IGNORE_ENV env var.
20+
$config->setUnsupportedPhpVersionAllowed(true);
1721

1822
$config->setRules([
1923
'@Symfony' => true,

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
- [#78](https://github.com/itk-dev/devops_itksites/pull/78)
11+
Update composer dependencies, fix php-cs-fixer deprecation
1012
- [#77](https://github.com/itk-dev/devops_itksites/pull/77)
1113
Fix SemverFilter: respect value2 with directional operators
1214
- [#76](https://github.com/itk-dev/devops_itksites/pull/76)

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@
114114
"assets:install %PUBLIC_DIR%": "symfony-cmd"
115115
},
116116
"coding-standards-apply": [
117-
"PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix"
117+
"vendor/bin/php-cs-fixer fix"
118118
],
119119
"coding-standards-check": [
120-
"PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --dry-run"
120+
"vendor/bin/php-cs-fixer fix --dry-run"
121121
],
122122
"fixtures-load": [
123123
"bin/console hautelook:fixtures:load --no-interaction"

0 commit comments

Comments
 (0)