Merge pull request #212 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Mar 15, 2023 · 9788af2 · 9788af2
2 parents 3957f63 + a9ed61e
commit 9788af2
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 52 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/tools/make/common.mk b/tools/make/common.mk
@@ -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

diff --git a/tools/make/symfony.mk b/tools/make/symfony.mk
@@ -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))