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

Automatic update
City-of-Helsinki · Aug 30, 2023 · cf96c97 · cf96c97
2 parents 8802316 + 2619213
commit cf96c97
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 41 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml
@@ -247,7 +247,7 @@ display:
         type: basic
         options:
           submit_button: Filter
-          reset_button: false
+          reset_button: true
           reset_button_label: Reset
           exposed_sorts_label: 'Sort by'
           expose_sort_order: true

diff --git a/tools/make/qa.mk b/tools/make/qa.mk
@@ -2,6 +2,7 @@ TEST_TARGETS += test-phpunit
 FIX_TARGETS :=
 LINT_PHP_TARGETS :=
 CS_INSTALLED := $(shell test -f $(COMPOSER_JSON_PATH)/vendor/bin/phpcs && echo yes || echo no)
+CS_CONF_EXISTS := $(shell test -f phpcs.xml.dist && echo yes || echo no)
 TESTSUITES ?= unit,kernel,functional
 
 PHONY += fix
@@ -57,10 +58,13 @@ define test_result
 	@echo "\n${YELLOW}${1}:${NO_COLOR} ${GREEN}${2}${NO_COLOR}"
 endef
 
-ifeq ($(CS_INSTALLED),yes)
+ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-yes)
 define cs
-$(call docker_compose_exec,vendor/bin/$(1) --config-set installed_paths $(CS_STANDARD_PATHS))
-$(call docker_compose_exec,vendor/bin/$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2))
+$(call docker_compose_exec,$(1))
+endef
+else ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-no)
+define cs
+$(call docker_compose_exec,$(1) --standard=$(CS_STANDARDS) --extensions=$(CS_EXTS) --ignore=node_modules $(2))
 endef
 else
 define cs

diff --git a/tools/make/symfony.mk b/tools/make/symfony.mk
@@ -1,6 +1,7 @@
 SF_FRESH_TARGETS := up build sf-cw sf-about sf-open
 FIX_TARGETS += fix-symfony
 LINT_PHP_TARGETS += lint-symfony
+CS_FIXER_INSTALLED := $(shell test -f $(COMPOSER_JSON_PATH)/vendor/bin/php-cs-fixer && echo yes || echo no)
 
 PHONY += encore-dev
 encore-dev: ## Do Encore development build
@@ -49,13 +50,12 @@ fresh: ## Build fresh development environment
 PHONY += fix-symfony
 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)
+	$(call cs_symfony,fix --ansi src)
 
 PHONY += lint-symfony
-lint-symfony: PATHS := src
 lint-symfony: ## Lint Symfony code style
 	$(call step,Lint Symfony code style...\n)
-	$(call cs_symfony,$(PATHS))
+	$(call cs_symfony,fix --dry-run --diff --ansi src)
 
 ifeq ($(RUN_ON),docker)
 define sf_console
@@ -67,12 +67,12 @@ define sf_console
 endef
 endif
 
-ifeq ($(CS_INSTALLED),yes)
+ifeq ($(CS_FIXER_INSTALLED),yes)
 define cs_symfony
-$(call docker_compose_exec,vendor/bin/phpcs --ignore=node_modules $(1))
+$(call docker_compose_exec,vendor/bin/php-cs-fixer $(1))
 endef
 else
 define cs_symfony
-$(call warn,CodeSniffer is not installed!)
+$(call warn,PHP CS Fixer is not installed!)
 endef
 endif