Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automatic update #212

Merged
merged 1 commit into from
Mar 15, 2023
Merged

Automatic update #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
101 changes: 58 additions & 43 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tools/make/common.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ shell-%: ## Login to remote instance

PHONY += sync
sync: ## Sync data from other environments
$(call group_step,Sync:$(NO_COLOR) $(SYNC_TARGETS)\n)
$(call group_step,Sync:$(NO_COLOR) $(SYNC_TARGETS))
@$(MAKE) $(SYNC_TARGETS) ENV=$(ENV)

PHONY += gh-download-dump
Expand Down
11 changes: 3 additions & 8 deletions tools/make/symfony.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,21 +47,16 @@ fresh: ## Build fresh development environment
@$(MAKE) $(SF_FRESH_TARGETS)

PHONY += fix-symfony
fix-symfony: tools/php-cs-fixer/vendor ## Fix Symfony code style
$(call step,Fix Symfony code style in ./src ...\n)
$(call docker_compose_exec,tools/php-cs-fixer/vendor/bin/php-cs-fixer --ansi -vvvv fix src)
fix-symfony: ## Fix Symfony code style
$(call step,Fix Symfony code style...\n)
$(call docker_compose_exec,PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --diff --ansi)

PHONY += lint-symfony
lint-symfony: PATHS := src
lint-symfony: ## Lint Symfony code style
$(call step,Lint Symfony code style...\n)
$(call cs_symfony,$(PATHS))

tools/php-cs-fixer/vendor: COMPOSER_JSON_PATH := tools/php-cs-fixer
tools/php-cs-fixer/vendor:
$(call step,Install php-cs-fixer...\n)
$(call composer,install)

ifeq ($(RUN_ON),docker)
define sf_console
$(call docker_compose_exec,bin/console $(1))
Expand Down