Skip to content

Commit

Permalink
PSR-12: (dcarbone#27)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
dcarbone authored Jun 5, 2022
1 parent 88f3cda commit 2302592
Show file tree
Hide file tree
Showing 264 changed files with 4,041 additions and 3,654 deletions.
14 changes: 14 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.PHONY: dev-docker
dev-docker:
docker buildx build -f docker/dev.Dockerfile -t php-dev:7.4-php-consul-api --load .

.PHONY: php-cs-fixer
php-cs-fixer:
./tools/php-cs-fixer/vendor/bin/php-cs-fixer fix \
--allow-risky=yes \
--config ./tools/php-cs-fixer/php-consul-api-rules.php_cs \
src
./tools/php-cs-fixer/vendor/bin/php-cs-fixer fix \
--allow-risky=yes \
--config ./tools/php-cs-fixer/php-consul-api-rules.php_cs \
tests
6 changes: 2 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,7 @@
}
},
"require-dev": {
"phpunit/phpunit": "@stable",
"friendsofphp/php-cs-fixer": "^3.0",
"adamwojs/php-cs-fixer-phpdoc-force-fqcn": "dev-master"
"phpunit/phpunit": "@stable"
},
"autoload-dev": {
"files": [
Expand All @@ -48,6 +46,6 @@
}
},
"scripts": {
"php-cs-fixer": "vendor/bin/php-cs-fixer fix --config tools/php-cs-fixer/more-different-psr12.php_cs src/"
"php-cs-fixer": "vendor/bin/php-cs-fixer fix --config tools/php-cs-fixer/php-consul-api-rules.php_cs src/"
}
}
Loading

0 comments on commit 2302592

Please sign in to comment.