Move PHP-CS-Fixer to CI (bamarni#111)

cs278 · Jul 10, 2022 · 917e1b8 · 917e1b8
1 parent 1b22452
commit 917e1b8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 12 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -31,11 +31,6 @@ jobs:
  php-version: "${{ matrix.php }}"
  tools: "composer"
 
- # It is not used in the CI and the PHP constraints may not match
- # the CI.
- - name: "Remove PHP-CS-Fixer"
- run: composer remove --dev --no-update php-cs-fixer/shim
-
  - name: "Install Composer dependencies"
  uses: "ramsey/composer-install@v2"
  with:
@@ -66,11 +61,6 @@ jobs:
  php-version: "${{ matrix.php }}"
  tools: "composer"
 
- # It is not used in the CI and the PHP constraints may not match
- # the CI.
- - name: "Remove PHP-CS-Fixer"
- run: composer remove --dev --no-update php-cs-fixer/shim
-
  - name: "Correct bin plugin version for e2e scenarios (PR-only)"
  if: github.event_name == 'pull_request'
  run: find e2e -maxdepth 1 -mindepth 1 -type d -exec bash -c "cd {} && composer require --dev bamarni/composer-bin-plugin:dev-${GITHUB_SHA} --no-update" \;

diff --git a/.phive/phars.xml b/.phive/phars.xml
@@ -2,4 +2,5 @@
 <phive xmlns="https://phar.io/phive">
  <phar name="composer-normalize" version="^2.28.3" installed="2.28.3" location="./tools/composer-normalize" copy="false"/>
  <phar name="infection" version="^0.26.13" installed="0.26.13" location="./tools/infection" copy="false"/>
+ <phar name="php-cs-fixer" version="^3.8.0" installed="3.8.0" location="./tools/php-cs-fixer" copy="false"/>
 </phive>
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ PHPUNIT = php -d zend.enable_gc=0 $(PHPUNIT_BIN)
 PHPUNIT_COVERAGE = XDEBUG_MODE=coverage $(PHPUNIT) --group default --coverage-xml=$(COVERAGE_DIR)/coverage-xml --log-junit=$(COVERAGE_DIR)/phpunit.junit.xml
 PHPSTAN_BIN = vendor/bin/phpstan
 PHPSTAN = $(PHPSTAN_BIN) analyse src tests
-PHP_CS_FIXER_BIN = vendor/bin/php-cs-fixer
+PHP_CS_FIXER_BIN = tools/php-cs-fixer
 PHP_CS_FIXER = $(PHP_CS_FIXER_BIN) fix --ansi --verbose --config=.php-cs-fixer.php
 COMPOSER_NORMALIZE_BIN=tools/composer-normalize
 COMPOSER_NORMALIZE = ./$(COMPOSER_NORMALIZE_BIN)
@@ -114,6 +114,7 @@ $(COVERAGE_DIR): $(PHPUNIT_BIN) src tests phpunit.xml.dist
  $(TOUCH) "$@"
 
 $(PHP_CS_FIXER_BIN): vendor
+ phive install php-cs-fixer
  $(TOUCH) "$@"
 
 $(PHPSTAN_BIN): vendor

diff --git a/composer.json b/composer.json
@@ -18,7 +18,6 @@
  "require-dev": {
  "ext-json": "*",
  "composer/composer": "^2.0",
- "php-cs-fixer/shim": "^3.8",
  "phpstan/extension-installer": "^1.1",
  "phpstan/phpstan": "^1.8",
  "phpstan/phpstan-phpunit": "^1.1",