From 4e6b1ba38334a79c21c1d725c1d252c34045c1e6 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Thu, 31 Aug 2023 06:59:51 +0000 Subject: [PATCH] Update configuration --- composer.lock | 58 ++++++++++---------- conf/cmi/language/fi/views.view.redirect.yml | 12 ---- conf/cmi/views.view.redirect.yml | 2 +- tools/make/qa.mk | 4 +- tools/make/symfony.mk | 12 ++-- 5 files changed, 38 insertions(+), 50 deletions(-) diff --git a/composer.lock b/composer.lock index e01190504..2c94c9108 100644 --- a/composer.lock +++ b/composer.lock @@ -3931,16 +3931,16 @@ }, { "name": "drupal/hdbt", - "version": "5.5.10", + "version": "5.5.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "7e26c936b71330c788143f97cc4e2a75f53e621f" + "reference": "b7ec48c8a0642a9cb9cc0bf90f2aa0cfb51516e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/7e26c936b71330c788143f97cc4e2a75f53e621f", - "reference": "7e26c936b71330c788143f97cc4e2a75f53e621f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b7ec48c8a0642a9cb9cc0bf90f2aa0cfb51516e8", + "reference": "b7ec48c8a0642a9cb9cc0bf90f2aa0cfb51516e8", "shasum": "" }, "require": { @@ -3958,10 +3958,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.12", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-30T07:02:24+00:00" + "time": "2023-08-31T06:14:18+00:00" }, { "name": "drupal/hdbt_admin", @@ -4050,16 +4050,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.19", + "version": "2.4.20", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "917de458ac2ed2b046a9c4125094f3d233c47289" + "reference": "1da31a4c69b2c3620a4f4636e599642dd7d6907c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/917de458ac2ed2b046a9c4125094f3d233c47289", - "reference": "917de458ac2ed2b046a9c4125094f3d233c47289", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/1da31a4c69b2c3620a4f4636e599642dd7d6907c", + "reference": "1da31a4c69b2c3620a4f4636e599642dd7d6907c", "shasum": "" }, "require": { @@ -4085,10 +4085,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.19", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.20", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-08-25T05:23:13+00:00" + "time": "2023-08-31T06:57:37+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4135,12 +4135,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "5445ad9e47c0231243068982ef6eeb64fa1363b0" + "reference": "a7868ae97fee754fd8110a991c364decbb492f1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/5445ad9e47c0231243068982ef6eeb64fa1363b0", - "reference": "5445ad9e47c0231243068982ef6eeb64fa1363b0", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/a7868ae97fee754fd8110a991c364decbb492f1a", + "reference": "a7868ae97fee754fd8110a991c364decbb492f1a", "shasum": "" }, "default-branch": true, @@ -4153,7 +4153,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-07-25T08:32:03+00:00" + "time": "2023-08-30T11:41:00+00:00" }, { "name": "drupal/helfi_navigation", @@ -4191,16 +4191,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.7", + "version": "3.3.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc" + "reference": "aaeb7062b3de2ec1a534122caffcd85f625a04ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d9636698e39f86d0aa56c2771e029d0abfd1b0dc", - "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/aaeb7062b3de2ec1a534122caffcd85f625a04ce", + "reference": "aaeb7062b3de2ec1a534122caffcd85f625a04ce", "shasum": "" }, "require": { @@ -4306,10 +4306,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.8", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-29T11:40:56+00:00" + "time": "2023-08-30T11:47:11+00:00" }, { "name": "drupal/helfi_proxy", @@ -6230,17 +6230,17 @@ }, { "name": "drupal/redirect", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/redirect.git", - "reference": "8.x-1.8" + "reference": "8.x-1.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.8.zip", - "reference": "8.x-1.8", - "shasum": "a7a440423434472ff7115ae69df01553f763f839" + "url": "https://ftp.drupal.org/files/projects/redirect-8.x-1.9.zip", + "reference": "8.x-1.9", + "shasum": "2987de20f509e9f7cec8a0f81d3a6774f9b0ba3e" }, "require": { "drupal/core": "^9.2 || ^10" @@ -6248,8 +6248,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.8", - "datestamp": "1661806955", + "version": "8.x-1.9", + "datestamp": "1693393506", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/language/fi/views.view.redirect.yml b/conf/cmi/language/fi/views.view.redirect.yml index e52be165c..190fb626d 100644 --- a/conf/cmi/language/fi/views.view.redirect.yml +++ b/conf/cmi/language/fi/views.view.redirect.yml @@ -5,18 +5,6 @@ display: status_code: group_info: group_items: - 15: - title: '300 Useita valintoja' - 16: - title: '301 Pysyvästi siirretty' - 17: - title: '302 Löydetty' - 18: - title: '303 Kts. toinen' - 19: - title: '304 Muuttamaton' - 20: - title: '305 Käytä proxyä' 7: title: '300 Multiple Choices' label: Tilakoodi diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml index 896f9fefc..57e27a1ec 100644 --- 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 index c3596a795..f4988fbea 100644 --- a/tools/make/qa.mk +++ b/tools/make/qa.mk @@ -60,11 +60,11 @@ endef ifeq ($(CS_INSTALLED)-$(CS_CONF_EXISTS),yes-yes) define cs -$(call docker_compose_exec,$(1)) +$(call docker_compose_exec,vendor/bin/$(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)) +$(call docker_compose_exec,vendor/bin/$(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 index a756dc7bd..069c6a789 100644 --- 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