Merge pull request #2086 from vrk-kpa/AV-2055_drupal_10_compatability

AV-2055: Drupal 10 compatability
vrk-kpa · Oct 16, 2023 · cbfc7d2 · cbfc7d2
2 parents 1fff736 + f998d89
commit cbfc7d2
Show file tree

Hide file tree

Showing 29 changed files with 266 additions and 626 deletions.
diff --git a/docker/README.md b/docker/README.md
@@ -148,7 +148,6 @@ services:
       - ../drupal/modules/avoindata-servicemessage/:/opt/drupal/web/modules/avoindata-servicemessage
       - ../drupal/modules/avoindata-hero/:/opt/drupal/web/modules/avoindata-hero
       - ../drupal/modules/avoindata-categories/:/opt/drupal/web/modules/avoindata-categories
-      - ../drupal/modules/avoindata-infobox/:/opt/drupal/web/modules/avoindata-infobox
       - ../drupal/modules/avoindata-newsfeed/:/opt/drupal/web/modules/avoindata-newsfeed
       - ../drupal/modules/avoindata-explore/:/opt/drupal/web/modules/avoindata-explore
       - ../drupal/modules/avoindata-footer/:/opt/drupal/web/modules/avoindata-footer

diff --git a/drupal/Dockerfile b/drupal/Dockerfile
@@ -89,7 +89,6 @@ COPY modules/avoindata-header               ${MOD_DIR}/avoindata-header/
 COPY modules/avoindata-servicemessage       ${MOD_DIR}/avoindata-servicemessage/
 COPY modules/avoindata-hero                 ${MOD_DIR}/avoindata-hero/
 COPY modules/avoindata-categories           ${MOD_DIR}/avoindata-categories/
-COPY modules/avoindata-infobox              ${MOD_DIR}/avoindata-infobox/
 COPY modules/avoindata-explore              ${MOD_DIR}/avoindata-explore/
 COPY modules/avoindata-newsfeed             ${MOD_DIR}/avoindata-newsfeed/
 COPY modules/avoindata-footer               ${MOD_DIR}/avoindata-footer/

diff --git a/drupal/composer.json b/drupal/composer.json
@@ -30,14 +30,14 @@
         "drupal/drush_language": "1.x-dev",
         "drupal/easy_breadcrumb": "^2.0",
         "drupal/fontawesome": "^2.25",
-        "drupal/fontawesome_menu_icons": "^1.3",
+        "drupal/fontawesome_menu_icons": "^2.0",
         "drupal/honeypot": "^2.0",
         "drupal/imce": "^3.0",
         "drupal/matomo": "^1.11",
         "drupal/menu_item_role_access": "^2.0",
         "drupal/menu_link_attributes": "^1.3",
         "drupal/metatag": "^1.7",
-        "drupal/password_policy": "^3.1",
+        "drupal/password_policy": "^4.0",
         "drupal/pathauto": "^1.2",
         "drupal/protected_forms": "^2.0",
         "drupal/raven": "^4.0",
@@ -48,7 +48,7 @@
         "drupal/token": "^1.5",
         "drupal/transliterate_filenames": "^2.0",
         "drupal/twig_field_value": "^2.0",
-        "drupal/twig_tweak": "^2.0",
+        "drupal/twig_tweak": "^3.2",
         "drupal/unpublished_node_permissions": "^1.0",
         "drupal/upgrade_status": "^4.0",
         "drush/drush": "^10.0.0",
@@ -138,7 +138,7 @@
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
         "drupal/ckeditor5_dev": "^1.0",
         "drupal/core-dev": "^9.2",
-        "drupal/devel": "^4.1",
+        "drupal/devel": "^5.1",
         "kint-php/kint": "^5.0",
         "squizlabs/php_codesniffer": "^3.6"
     }