diff --git a/.env b/.env index 316821616..90c72b202 100644 --- a/.env +++ b/.env @@ -15,8 +15,8 @@ OC_PROJECT_NAME=hki-kanslia-liikenne-test # Local hostname DRUPAL_HOSTNAME=helfi-kymp.docker.so -STAGE_FILE_PROXY_ORIGIN= -STAGE_FILE_PROXY_ORIGIN_DIR= +STAGE_FILE_PROXY_ORIGIN=https://stplattaprod.blob.core.windows.net +STAGE_FILE_PROXY_ORIGIN_DIR=liikenneprod # Docker image DRUPAL_IMAGE=ghcr.io/city-of-helsinki/drupal-web:8.3 diff --git a/composer.lock b/composer.lock index 77dcf69f8..156ed989e 100644 --- a/composer.lock +++ b/composer.lock @@ -6290,17 +6290,17 @@ }, { "name": "drupal/stage_file_proxy", - "version": "2.1.2", + "version": "2.1.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/stage_file_proxy.git", - "reference": "2.1.2" + "reference": "2.1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.2.zip", - "reference": "2.1.2", - "shasum": "a25c395022f6ff39aa290c6eca3ead6028bac664" + "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.4.zip", + "reference": "2.1.4", + "shasum": "85f8451f123fcfb1b272f5a0cc11e6bd1673476c" }, "require": { "drupal/core": "^9 || ^10", @@ -6308,13 +6308,13 @@ }, "require-dev": { "drupal/coder": "^8.3", - "drush/drush": "^11" + "drush/drush": "^11 || ^12" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.2", - "datestamp": "1697812711", + "version": "2.1.4", + "datestamp": "1706627704", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -14755,16 +14755,16 @@ }, { "name": "drupal/coder", - "version": "8.3.23", + "version": "8.3.24", "source": { "type": "git", "url": "https://github.com/pfrenssen/coder.git", - "reference": "1a1613d83c08dac5be593f2775c9eccae1b41805" + "reference": "1a59890f972db5da091354f0191dec1037f7c582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pfrenssen/coder/zipball/1a1613d83c08dac5be593f2775c9eccae1b41805", - "reference": "1a1613d83c08dac5be593f2775c9eccae1b41805", + "url": "https://api.github.com/repos/pfrenssen/coder/zipball/1a59890f972db5da091354f0191dec1037f7c582", + "reference": "1a59890f972db5da091354f0191dec1037f7c582", "shasum": "" }, "require": { @@ -14773,7 +14773,7 @@ "php": ">=7.2", "sirbrillig/phpcs-variable-analysis": "^2.11.7", "slevomat/coding-standard": "^8.11", - "squizlabs/php_codesniffer": "^3.7.1", + "squizlabs/php_codesniffer": "^3.9.1", "symfony/yaml": ">=3.4.0" }, "require-dev": { @@ -14802,7 +14802,7 @@ "issues": "https://www.drupal.org/project/issues/coder", "source": "https://www.drupal.org/project/coder" }, - "time": "2024-01-27T18:13:12+00:00" + "time": "2024-04-21T06:13:24+00:00" }, { "name": "drupal/core-dev", @@ -18167,16 +18167,16 @@ }, { "name": "sirbrillig/phpcs-variable-analysis", - "version": "v2.11.17", + "version": "v2.11.18", "source": { "type": "git", "url": "https://github.com/sirbrillig/phpcs-variable-analysis.git", - "reference": "3b71162a6bf0cde2bff1752e40a1788d8273d049" + "reference": "ca242a0b7309e0f9d1f73b236e04ecf4ca3248d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/3b71162a6bf0cde2bff1752e40a1788d8273d049", - "reference": "3b71162a6bf0cde2bff1752e40a1788d8273d049", + "url": "https://api.github.com/repos/sirbrillig/phpcs-variable-analysis/zipball/ca242a0b7309e0f9d1f73b236e04ecf4ca3248d0", + "reference": "ca242a0b7309e0f9d1f73b236e04ecf4ca3248d0", "shasum": "" }, "require": { @@ -18221,36 +18221,36 @@ "source": "https://github.com/sirbrillig/phpcs-variable-analysis", "wiki": "https://github.com/sirbrillig/phpcs-variable-analysis/wiki" }, - "time": "2023-08-05T23:46:11+00:00" + "time": "2024-04-13T16:42:46+00:00" }, { "name": "slevomat/coding-standard", - "version": "8.14.1", + "version": "8.15.0", "source": { "type": "git", "url": "https://github.com/slevomat/coding-standard.git", - "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926" + "reference": "7d1d957421618a3803b593ec31ace470177d7817" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/fea1fd6f137cc84f9cba0ae30d549615dbc6a926", - "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926", + "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817", + "reference": "7d1d957421618a3803b593ec31ace470177d7817", "shasum": "" }, "require": { "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0", "php": "^7.2 || ^8.0", "phpstan/phpdoc-parser": "^1.23.1", - "squizlabs/php_codesniffer": "^3.7.1" + "squizlabs/php_codesniffer": "^3.9.0" }, "require-dev": { "phing/phing": "2.17.4", "php-parallel-lint/php-parallel-lint": "1.3.2", - "phpstan/phpstan": "1.10.37", + "phpstan/phpstan": "1.10.60", "phpstan/phpstan-deprecation-rules": "1.1.4", - "phpstan/phpstan-phpunit": "1.3.14", - "phpstan/phpstan-strict-rules": "1.5.1", - "phpunit/phpunit": "8.5.21|9.6.8|10.3.5" + "phpstan/phpstan-phpunit": "1.3.16", + "phpstan/phpstan-strict-rules": "1.5.2", + "phpunit/phpunit": "8.5.21|9.6.8|10.5.11" }, "type": "phpcodesniffer-standard", "extra": { @@ -18274,7 +18274,7 @@ ], "support": { "issues": "https://github.com/slevomat/coding-standard/issues", - "source": "https://github.com/slevomat/coding-standard/tree/8.14.1" + "source": "https://github.com/slevomat/coding-standard/tree/8.15.0" }, "funding": [ { @@ -18286,20 +18286,20 @@ "type": "tidelift" } ], - "time": "2023-10-08T07:28:08+00:00" + "time": "2024-03-09T15:20:58+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.8.1", + "version": "3.9.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7" + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/14f5fff1e64118595db5408e946f3a22c75807f7", - "reference": "14f5fff1e64118595db5408e946f3a22c75807f7", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/aac1f6f347a5c5ac6bc98ad395007df00990f480", + "reference": "aac1f6f347a5c5ac6bc98ad395007df00990f480", "shasum": "" }, "require": { @@ -18366,7 +18366,7 @@ "type": "open_collective" } ], - "time": "2024-01-11T20:47:48+00:00" + "time": "2024-04-23T20:25:34+00:00" }, { "name": "symfony/browser-kit", diff --git a/public/modules/custom/helfi_kymp_content/src/Plugin/Block/SubdistrictsNavigationBlock.php b/public/modules/custom/helfi_kymp_content/src/Plugin/Block/SubdistrictsNavigationBlock.php index 5696fdf9b..cb88db70f 100644 --- a/public/modules/custom/helfi_kymp_content/src/Plugin/Block/SubdistrictsNavigationBlock.php +++ b/public/modules/custom/helfi_kymp_content/src/Plugin/Block/SubdistrictsNavigationBlock.php @@ -64,7 +64,7 @@ public function __construct( private EntityTypeManagerInterface $entityTypeManager, private LanguageManagerInterface $languageManager, private RequestStack $requestStack, - private AccountProxyInterface $currentUser + private AccountProxyInterface $currentUser, ) { parent::__construct($configuration, $plugin_id, $plugin_definition); } diff --git a/public/modules/custom/helfi_kymp_migrations/src/TaxonomyMigrationService.php b/public/modules/custom/helfi_kymp_migrations/src/TaxonomyMigrationService.php index e964e4713..b37661f4c 100644 --- a/public/modules/custom/helfi_kymp_migrations/src/TaxonomyMigrationService.php +++ b/public/modules/custom/helfi_kymp_migrations/src/TaxonomyMigrationService.php @@ -32,7 +32,7 @@ class TaxonomyMigrationService { public function __construct( protected FileSystemInterface $fileSystem, protected ModuleHandlerInterface $moduleHandler, - protected EntityTypeManagerInterface $entityTypeManager + protected EntityTypeManagerInterface $entityTypeManager, ) { $this->projectFilePath = $this->fileSystem->realpath( $this->moduleHandler->getModule('helfi_kymp_migrations')->getPath() diff --git a/public/modules/custom/helfi_kymp_plans/src/ListOfPlans.php b/public/modules/custom/helfi_kymp_plans/src/ListOfPlans.php index b931700c0..a8fa32333 100644 --- a/public/modules/custom/helfi_kymp_plans/src/ListOfPlans.php +++ b/public/modules/custom/helfi_kymp_plans/src/ListOfPlans.php @@ -16,7 +16,7 @@ class ListOfPlans { * RSS feed URL. */ public function __construct( - public string $rss_feed_url = 'https://ptp.hel.fi/rss/nahtavana_nyt/' + public string $rss_feed_url = 'https://ptp.hel.fi/rss/nahtavana_nyt/', ) {} /**