Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions makefiles/PHPCodeSniffer.mk
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ ifeq ("$(HAS_PHPCS)","TRUE")

phpcs: install
@$(call MK_INFO,"Checking coding standards")
@$(DOCKER_RUN) ${DOCKER_IMAGE_ID} vendor/bin/phpcs
@$(DOCKER_RUN) $(DOCKER_IMAGE_NAME) vendor/bin/phpcs
.PHONY: phpcs

phpcbf: install
@$(call MK_INFO,"Fixing coding standards")
@$(DOCKER_RUN) ${DOCKER_IMAGE_ID} vendor/bin/phpcbf
@$(DOCKER_RUN) $(DOCKER_IMAGE_NAME) vendor/bin/phpcbf
.PHONY: phpcs

ifneq ("$(PHPCS_CACHE_FILE)", "")
Expand Down
2 changes: 1 addition & 1 deletion makefiles/PHPUnit.mk
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ifeq ("$(HAS_PHPUNIT)","TRUE")

HELP +=$(call MK_HELP,'test','Run PHPUnit tests')
test: install
@$(DOCKER_RUN) ${DOCKER_IMAGE_ID} vendor/bin/phpunit
@$(DOCKER_RUN) $(DOCKER_IMAGE_NAME) vendor/bin/phpunit
.PHONY: test

clear-phpunit-cache:
Expand Down
8 changes: 4 additions & 4 deletions makefiles/Psalm.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,26 @@ ifeq ("$(HAS_PSALM)","TRUE")

HELP +=$(call MK_HELP,'psalm','Run Psalm static analysis')
psalm: install
@$(DOCKER_RUN) ${DOCKER_IMAGE_ID} vendor/bin/psalm
@$(DOCKER_RUN) $(DOCKER_IMAGE_NAME) vendor/bin/psalm
.PHONY: psalm

HELP +=$(call MK_HELP,'psalm-update-baseline','Update the Psalm baseline removing outdated issues')
psalm-update-baseline: install
ifneq ("$(wildcard ${PSALM_BASELINE})", "")
@$(DOCKER_RUN) ${DOCKER_IMAGE_ID} vendor/bin/psalm --update-baseline
@$(DOCKER_RUN) $(DOCKER_IMAGE_NAME) vendor/bin/psalm --update-baseline
else
@$(call MK_ERROR, "A Psalm baseline has not been configured. Run `set-psalm-baseline` first.")
endif
.PHONY: psalm-update-baseline

HELP +=$(call MK_HELP,'psalm-set-baseline','Add new issues to the Psalm baseline')
psalm-set-baseline: install
@$(DOCKER_RUN) ${DOCKER_IMAGE_ID} vendor/bin/psalm --set-baseline=${PSALM_BASELINE}
@$(DOCKER_RUN) $(DOCKER_IMAGE_NAME) vendor/bin/psalm --set-baseline=${PSALM_BASELINE}
.PHONY: psalm-set-baseline

HELP +=$(call MK_HELP,'psalm-clear-cache','Clear the Psalm cache')
psalm-clear-cache: install
@$(DOCKER_RUN) ${DOCKER_IMAGE_ID} vendor/bin/psalm --clear-cache
@$(DOCKER_RUN) $(DOCKER_IMAGE_NAME) vendor/bin/psalm --clear-cache
.PHONY: psalm-clear-cache

endif
Loading