Skip to content

Commit

Permalink
Merge pull request #35 from odolbeau/prepare-310
Browse files Browse the repository at this point in the history
Prepare v3.1.0
  • Loading branch information
Olivier Dolbeau authored Apr 27, 2020
2 parents 3d00c71 + 2113aef commit 7e89b82
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ jobs:
steps:
- uses: actions/checkout@master
- name: PHPStan
uses: docker://oskarstark/phpstan-ga
uses: docker://jakzal/phpqa:latest
with:
args: analyze --no-progress
args: phpstan analyze --no-progress

php-cs-fixer:
name: PHP-CS-Fixer
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- name: PHP-CS-Fixer
uses: docker://oskarstark/php-cs-fixer-ga
uses: docker://jakzal/phpqa:latest
with:
args: --dry-run --diff-format udiff
args: php-cs-fixer fix --dry-run --diff-format udiff
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,15 @@ Changelog
Unreleased
----------

3.1.0
-----

* Add support of null values in phone number deserializer
* Refactor `PhoneNumber` constraints & validator to accept more than 1 type.
* Clarify LICENSE & add copyright back
* Update README
* Revamped folder
* Add the ability to pass options down to country and number fields

3.0.0
-----
Expand Down
28 changes: 28 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.PHONY: ${TARGETS}
.DEFAULT_GOAL := help

DIR := ${CURDIR}
SYMFONY = php bin/console
QA_IMAGE := jakzal/phpqa:latest

help:
@echo "\033[33mUsage:\033[0m"
@echo " make [command]"
@echo ""
@echo "\033[33mAvailable commands:\033[0m"
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort \
| awk 'BEGIN {FS = ":.*?## "}; {printf " \033[32m%s\033[0m___%s\n", $$1, $$2}' | column -ts___

cs-lint: ## Verify check styles
@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff --allow-risky=yes --dry-run -vvv

cs-fix: ## Apply Check styles
@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) php-cs-fixer fix --diff-format udiff --allow-risky=yes -vvv

phpstan: ## Run PHPStan
@docker run --rm -v $(DIR):/project -w /project $(QA_IMAGE) phpstan analyse

phpunit: ## Run phpunit
-./vendor/bin/phpunit

test: phpunit cs-lint phpstan ## Run tests
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "4.0.x-dev"
"dev-master": "3.1.x-dev"
}
}
}

0 comments on commit 7e89b82

Please sign in to comment.