From 2619213bc037844e8fb428b3ebb46ab901fbef59 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 30 Aug 2023 11:43:34 +0000 Subject: [PATCH] Update configuration --- composer.lock | 65 +++++++++++++++++--------------- conf/cmi/views.view.redirect.yml | 2 +- tools/make/qa.mk | 10 +++-- tools/make/symfony.mk | 12 +++--- 4 files changed, 48 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index 04da3e50..aa1afbf7 100644 --- a/composer.lock +++ b/composer.lock @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.5.9", + "version": "5.5.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a" + "reference": "8c2b38e3d3c37d7c1474204828bbd13260f6850b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", - "reference": "9067b6e6beb08ad0320cd5fcf348dab1c8a4c77a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/8c2b38e3d3c37d7c1474204828bbd13260f6850b", + "reference": "8c2b38e3d3c37d7c1474204828bbd13260f6850b", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-28T13:26:21+00:00" + "time": "2023-08-30T11:32:12+00:00" }, { "name": "drupal/hdbt_admin", @@ -3955,12 +3955,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, @@ -3973,7 +3973,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", @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.6", + "version": "3.3.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa" + "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a9f447f9a9e681a73ec609423c82b4e004d2e0aa", - "reference": "a9f447f9a9e681a73ec609423c82b4e004d2e0aa", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d9636698e39f86d0aa56c2771e029d0abfd1b0dc", + "reference": "d9636698e39f86d0aa56c2771e029d0abfd1b0dc", "shasum": "" }, "require": { @@ -4115,6 +4115,9 @@ }, "drupal/translatable_menu_link_uri": { "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/c03c575cdd293b7933248cfb4d0fb7b47be5422b/patches/translatable_menu_link_uri_d10.patch" + }, + "drupal/simple_sitemap": { + "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch" } } }, @@ -4123,10 +4126,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.6", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.7", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-29T07:11:13+00:00" + "time": "2023-08-29T11:40:56+00:00" }, { "name": "drupal/helfi_proxy", @@ -5446,17 +5449,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" @@ -5464,8 +5467,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" @@ -7145,16 +7148,16 @@ }, { "name": "fileeye/mimemap", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/FileEye/MimeMap.git", - "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f" + "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/58fbd11312a8f69e0824a640b86b33a9d096fe7f", - "reference": "58fbd11312a8f69e0824a640b86b33a9d096fe7f", + "url": "https://api.github.com/repos/FileEye/MimeMap/zipball/befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", + "reference": "befb9f1ee77dbf6b74a2c578874e128c9a5c1a2d", "shasum": "" }, "require": { @@ -7163,7 +7166,7 @@ "require-dev": { "composer-runtime-api": "^2.0.0", "phpstan/phpstan": "^1.2", - "phpunit/phpunit": "^9", + "phpunit/phpunit": "^9 | ^10", "sebastian/comparator": ">=4", "sebastian/diff": ">=4", "squizlabs/php_codesniffer": ">=3.6", @@ -7171,7 +7174,7 @@ "symfony/filesystem": ">=5.4", "symfony/var-dumper": ">=5.4", "symfony/yaml": ">=5.4", - "vimeo/psalm": "^4.23" + "vimeo/psalm": "^4.23 | ^5" }, "bin": [ "bin/fileeye-mimemap" @@ -7201,9 +7204,9 @@ ], "support": { "issues": "https://github.com/FileEye/MimeMap/issues", - "source": "https://github.com/FileEye/MimeMap/tree/2.0.1" + "source": "https://github.com/FileEye/MimeMap/tree/2.0.2" }, - "time": "2023-02-11T19:58:58+00:00" + "time": "2023-08-29T16:20:26+00:00" }, { "name": "fileeye/pel", diff --git a/conf/cmi/views.view.redirect.yml b/conf/cmi/views.view.redirect.yml index 53938368..e0176deb 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 0dae5b6c..c3596a79 100644 --- 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 index a756dc7b..069c6a78 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