Merge pull request #567 from City-of-Helsinki/develop

Release 13.6.
City-of-Helsinki · Jun 13, 2024 · 1d5dfd9 · 1d5dfd9
2 parents a006cdb + f8f180d
commit 1d5dfd9
Show file tree

Hide file tree

Showing 121 changed files with 4,025 additions and 19,397 deletions.
diff --git a/.env b/.env
@@ -8,6 +8,9 @@ COMPOSE_PROJECT_NAME=asuntotuotanto
 # OpenShift project name
 OC_PROJECT_NAME=hki-kanslia-aok-asuntotuotanto-test
 
+# OpenShift pod name to get the dump
+OC_DEPLOYMENT_CONFIG_NAME=asuntotuotanto-drupal-cron
+
 # Local hostname
 DRUPAL_HOSTNAME=asuntotuotanto.docker.so
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,7 +61,7 @@ jobs:
           vendor/bin/phpcs public/themes/custom/ --ignore="*.js,*.css" --extensions=php,theme --standard=Drupal,DrupalPractice
 
       - name: Run phpstan
-        run: vendor/bin/phpstan analyze
+        run: vendor/bin/phpstan analyse phpstan.neon
 
       - name: Download latest dump
         env:

diff --git a/composer.json b/composer.json
@@ -18,12 +18,11 @@
         "drupal/better_exposed_filters": "^6.0.3",
         "drupal/better_passwords": "^2.2",
         "drupal/better_social_sharing_buttons": "^4.0",
-        "drupal/coffee": "^1.3",
         "drupal/computed_field_plugin": "^1.4",
         "drupal/config_terms": "^1.9",
         "drupal/context": "^5.0@RC",
-        "drupal/core": "^10.2.2",
-        "drupal/core-composer-scaffold": "^10.2.2",
+        "drupal/core": "^10.2",
+        "drupal/core-composer-scaffold": "^10.2",
         "drupal/email_registration": "^1.4",
         "drupal/externalauth": "^2.0",
         "drupal/field_group": "^3.1",
@@ -45,17 +44,16 @@
         "drupal/menu_block": "^1.10",
         "drupal/nocurrent_pass": "^1.3",
         "drupal/rabbit_hole": "^1.0-beta11",
-        "drupal/raven": "^3.2",
+        "drupal/raven": "^5.0",
         "drupal/rebuild_cache_access": "^1.9",
         "drupal/redis": "^1.7",
-        "drupal/registration_role": "^2.0",
+        "drupal/registration_role": "^2.0.1",
         "drupal/restui": "^1.21",
         "drupal/route_condition": "^2.0.2",
         "drupal/samlauth": "^3.9",
         "drupal/slick": "^2.10",
-        "drupal/swiftmailer": "^2.4",
-        "drupal/symfony_mailer_lite": "^1.0",
-        "drupal/ultimate_cron": "^2.0-alpha6",
+        "drupal/symfony_mailer_lite": "^1.0.6",
+        "drupal/ultimate_cron": "^2.0@alpha",
         "drupal/user_bundle": "^1.2",
         "drupal/user_registrationpassword": "^2.0.0",
         "drupal/yearonly": "^9.1",
@@ -173,9 +171,9 @@
             "type": "package",
             "package": {
                 "name": "asuntomyynti/react",
-                "version": "1.4.0",
+                "version": "1.4.1",
                 "dist": {
-                    "url": "https://github.com/City-of-Helsinki/asuntomyynti-react/releases/download/v.1.4.0/asuntomyynti-react-1.4.0.zip",
+                    "url": "https://github.com/City-of-Helsinki/asuntomyynti-react/releases/download/v.1.4.1/asuntomyynti-react-1.4.1.zip",
                     "type": "zip"
                 }
             }