Merge pull request #561 from UN-OCHA/develop

[IASC-675][IASC-724][IASC-725][OPS-7997][OPS-7998] So many tikkerts

Author: cafuego

composer.json

@@ -17,6 +17,10 @@
         {
             "type": "composer",
             "url": "https://asset-packagist.org"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/UN-OCHA/file_checker"
         }
     ],
     "require": {
@@ -30,18 +34,18 @@
         "drupal/components": "^2.4",
         "drupal/conditional_fields": "^4.0@alpha",
         "drupal/config_split": "^2.0.0-beta4",
-        "drupal/core-composer-scaffold": "^9.2.6",
-        "drupal/core-project-message": "^9.2.6",
-        "drupal/core-recommended": "^9.2.6",
+        "drupal/core-composer-scaffold": "^9.3.3",
+        "drupal/core-project-message": "^9.3.3",
+        "drupal/core-recommended": "^9.3.3",
         "drupal/ctools": "^3.7",
         "drupal/date_recur": "^3.0",
         "drupal/date_recur_modular": "^3.0",
         "drupal/diff": "^1.0@RC",
         "drupal/dream_block_manager": "^1.0",
         "drupal/dynamic_entity_reference": "^1.7",
         "drupal/entityqueue": "^1.0",
-        "drupal/facets": "^1.8",
-        "drupal/facets_pretty_paths": "^1.0@beta",
+        "drupal/facets": "^2.0",
+        "drupal/facets_pretty_paths": "^1.2",
         "drupal/field_group": "^3.0",
         "drupal/field_permissions": "^1.0@RC",
         "drupal/file_entity": "^2.0@beta",
@@ -52,6 +56,7 @@
         "drupal/geophp": "^1.0@beta",
         "drupal/google_tag": "^1.2",
         "drupal/group": "^1.0.0",
+        "drupal/honeypot": "^2.0",
         "drupal/linkit": "^6.0@beta",
         "drupal/maintenance200": "^1.0",
         "drupal/media_entity_file_replace": "^1.0",
@@ -62,16 +67,17 @@
         "drupal/paragraphs_viewmode": "^1.0@alpha",
         "drupal/pathauto": "^1.4",
         "drupal/realname": "^2.0@beta",
-        "drupal/redirect": "^1.4",
+        "drupal/redirect": "^1.7",
         "drupal/redis": "^1.4",
         "drupal/search_api": "^1.14",
         "drupal/search_api_attachments": "^1.0@beta",
-        "drupal/search_api_solr": "^4.1",
+        "drupal/search_api_solr": "^4.2.3",
         "drupal/seckit": "^2.0",
         "drupal/select2": "^1.6",
         "drupal/select_or_other": "^4.0",
-        "drupal/social_auth_hid": "^2.2",
+        "drupal/social_auth_hid": "^3.0",
         "drupal/spamspan": "^1.2",
+        "drupal/stage_file_proxy": "^1.1",
         "drupal/tablefield": "^2.1",
         "drupal/token": "^1.5",
         "drupal/token_filter": "^1.2",
@@ -85,22 +91,24 @@
         "phpoffice/phpspreadsheet": "^1.16",
         "symfony/flex": "^1.17",
         "unocha/common_design": "^5.0.0",
+        "unocha/file_checker": "dev-8.x-1.x",
         "unocha/ocha_integrations": "^1.0",
         "unocha/un_date": "^1.0.1",
         "vlucas/phpdotenv": "^2.4",
         "webflo/drupal-finder": "^1.0.0",
-        "webmozart/path-util": "^2.3"
+        "webmozart/path-util": "^2.3",
+        "wikimedia/composer-merge-plugin": "^2.0.1"
     },
     "require-dev": {
         "drupal/coder": "^8.3",
         "drupal/config_filter": "^2.2",
-        "drupal/core-dev": "^9.2.6",
+        "drupal/core-dev": "^9.3.3",
         "drupal/devel": "^4.1",
-        "drupal/stage_file_proxy": "^1.1",
         "drupal/upgrade_rector": "1.x-dev@dev",
         "drupal/upgrade_status": "^3.8",
         "kint-php/kint": "^3.3",
         "phpmd/phpmd": "^2.6",
+        "phpspec/prophecy-phpunit": "^2",
         "weitzman/drupal-test-traits": "^1.5",
         "weitzman/logintrait": "^1.1"
     },
@@ -111,7 +119,18 @@
     "prefer-stable": true,
     "config": {
     "bin-dir": "vendor/bin/",
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "drupal-composer/preserve-paths": true,
+            "drupal/core-composer-scaffold": true,
+            "drupal/core-project-message": true,
+            "drupal/console-extend-plugin": true,
+            "oomphinc/composer-installers-extender": true,
+            "symfony/flex": true,
+            "wikimedia/composer-merge-plugin": true
+        }
     },
     "scripts": {
         "sass-prepare": "cd html/themes/custom/iasc_common_design && npm install",
@@ -144,6 +163,14 @@
             "html/themes/contrib/{$name}": ["type:drupal-theme"],
             "drush/Commands/{$name}": ["type:drupal-drush"]
         },
+        "merge-plugin": {
+          "include": [
+            "html/modules/contrib/webform/composer.libraries.json"
+          ],
+          "merge-extra": true,
+          "merge-extra-deep": true,
+          "merge-scripts": true
+        },
         "preserve-paths": [
             "html/modules/custom",
             "html/themes/custom"