Skip to content

Commit 2302592

Browse files
authored
PSR-12: (#27)
* PSR-12: - Updating entire codebsae to utilize even-more-mildly modified psr-12 ruleset from php-cs-fixer - Adding makefile with really basic targets - Moving php-cs-fixer composer files to tools/php-cs-fixer dir * correcting test class field definition
1 parent 88f3cda commit 2302592

File tree

264 files changed

+4041
-3654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+4041
-3654
lines changed

Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.PHONY: dev-docker
2+
dev-docker:
3+
docker buildx build -f docker/dev.Dockerfile -t php-dev:7.4-php-consul-api --load .
4+
5+
.PHONY: php-cs-fixer
6+
php-cs-fixer:
7+
./tools/php-cs-fixer/vendor/bin/php-cs-fixer fix \
8+
--allow-risky=yes \
9+
--config ./tools/php-cs-fixer/php-consul-api-rules.php_cs \
10+
src
11+
./tools/php-cs-fixer/vendor/bin/php-cs-fixer fix \
12+
--allow-risky=yes \
13+
--config ./tools/php-cs-fixer/php-consul-api-rules.php_cs \
14+
tests

composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
}
3434
},
3535
"require-dev": {
36-
"phpunit/phpunit": "@stable",
37-
"friendsofphp/php-cs-fixer": "^3.0",
38-
"adamwojs/php-cs-fixer-phpdoc-force-fqcn": "dev-master"
36+
"phpunit/phpunit": "@stable"
3937
},
4038
"autoload-dev": {
4139
"files": [
@@ -48,6 +46,6 @@
4846
}
4947
},
5048
"scripts": {
51-
"php-cs-fixer": "vendor/bin/php-cs-fixer fix --config tools/php-cs-fixer/more-different-psr12.php_cs src/"
49+
"php-cs-fixer": "vendor/bin/php-cs-fixer fix --config tools/php-cs-fixer/php-consul-api-rules.php_cs src/"
5250
}
5351
}

0 commit comments

Comments
 (0)