Skip to content

Commit f5ce104

Browse files
committed
Switch to local php-cs-fixer installation to be more regularly up to date
1 parent 97e889c commit f5ce104

File tree

4 files changed

+6
-4
lines changed

4 files changed

+6
-4
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
/docs export-ignore
1515
/docker export-ignore
1616
/docker-compose.yml export-ignore
17+
/tools export-ignore
1718
/Makefile export-ignore
1819
/phpstan.neon export-ignore

Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,14 @@ ti: vendor
5656
vendor:
5757
$(COMPOSER) update $(DEPS_STRATEGY)
5858

59-
PHP_CS_FIXER = docker pull cytopia/php-cs-fixer:latest-php7.4 && docker run --rm -t -v `pwd`:/data cytopia/php-cs-fixer:latest-php7.4
59+
PHP_CS_FIXER = docker-compose run --rm -T php tools/php-cs-fixer/vendor/bin/php-cs-fixer fix -vv --allow-risky=yes
6060

6161
phpcs:
62-
$(PHP_CS_FIXER) fix -vv --dry-run --allow-risky=yes
62+
PHP_VERSION=7.4 docker-compose run --rm -T php composer require --working-dir=tools/php-cs-fixer friendsofphp/php-cs-fixer
63+
PHP_VERSION=7.4 $(PHP_CS_FIXER) --dry-run
6364

6465
phpcbf:
65-
$(PHP_CS_FIXER) fix -vv --allow-risky=yes
66+
$(PHP_CS_FIXER)
6667

6768
phpstan: vendor
6869
$(EXEC_PHP) vendor/bin/phpstan analyse src -c phpstan.neon -a vendor/autoload.php

tests/Spellchecker/IspellTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function testSpellcheckFromFakeBinaries(): void
2121

2222
public function testGetSupportedLanguagesFromFakeBinaries(): void
2323
{
24-
$this->assertWorkingSupportedLanguages(self::FAKE_BINARIES_PATH, self:: FAKE_BINARIES_PATH);
24+
$this->assertWorkingSupportedLanguages(self::FAKE_BINARIES_PATH, self::FAKE_BINARIES_PATH);
2525
}
2626

2727
public function testBadCheckRequest(): void

tools/php-cs-fixer/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)