Merge branch 'main' into live

USEPA · Mar 22, 2023 · 4ecbccc · 4ecbccc
2 parents 74c1403 + e9be8b2
commit 4ecbccc
Show file tree

Hide file tree

Showing 295 changed files with 8,927 additions and 31,330 deletions.
diff --git a/services/drupal/.ddev/config.yaml b/services/drupal/.ddev/config.yaml
@@ -13,7 +13,7 @@ mysql_version: "5.7"
 nfs_mount_enabled: false
 mutagen_enabled: false
 use_dns_when_possible: true
-composer_version: "2.2.10"
+composer_version: "2"
 web_environment: []
 hooks:
   post-start:

diff --git a/services/drupal/.phpcs.xml.dist b/services/drupal/.phpcs.xml.dist
@@ -24,4 +24,5 @@
   <exclude-pattern>scripts/*</exclude-pattern>
   <exclude-pattern>web/private/*</exclude-pattern>
   <exclude-pattern>web/sites/default/*</exclude-pattern>
+  <exclude-pattern>web/sites/all/*</exclude-pattern>
 </ruleset>
diff --git a/services/drupal/composer.json b/services/drupal/composer.json
@@ -202,7 +202,7 @@
         }
     ],
     "require": {
-        "php": ">=7.4",
+        "php": ">=8.0",
         "briancherne/jquery-hoverintent": "^1.10",
         "ckeditor-plugin/fakeobjects": "^4.15",
         "ckeditor-plugin/iframe": "^4.15",
@@ -211,7 +211,7 @@
         "cweagans/composer-patches": "^1.6.5",
         "d3/d3": "^3.5",
         "drupal/address": "^1.7",
-        "drupal/addtocal": "^1.1",
+        "drupal/addtocal": "^2.0",
         "drupal/admin_toolbar": "^2.0",
         "drupal/allowed_formats": "^1.3",
         "drupal/anchor": "^1.0",
@@ -234,8 +234,8 @@
         "drupal/config_split": "~1.5",
         "drupal/content_moderation_notifications": "dev-3.x#9ab3da5",
         "drupal/content_moderation_revert": "1.x-dev",
-        "drupal/core-composer-scaffold": "~9.4.7",
-        "drupal/core-recommended": "~9.4.7",
+        "drupal/core-composer-scaffold": "~9.4.10",
+        "drupal/core-recommended": "~9.4.10",
         "drupal/cshs": "^3.5",
         "drupal/default_content": "^1.0-alpha9",
         "drupal/devel": "^4.0",
@@ -245,7 +245,7 @@
         "drupal/editoria11y": "^2.0",
         "drupal/elasticsearch_connector": "^7.0-alpha3",
         "drupal/embed": "^1.4",
-        "drupal/entity_browser": "^2.6",
+        "drupal/entity_browser": "^2.9",
         "drupal/entity_clone": "^1.0@beta",
         "drupal/entity_usage": "^2.0-beta3",
         "drupal/entitygroupfield": "^1.0@alpha",
@@ -254,7 +254,7 @@
         "drupal/facets_pretty_paths": "^1.4",
         "drupal/fast_404": "^2.0@alpha",
         "drupal/field_group": "^3.0",
-        "drupal/filter_html_plus": "^1.0-alpha2",
+        "drupal/filter_html_plus": "^2.0",
         "drupal/fixed_block_content": "^1.1",
         "drupal/flag": "^4.0@beta",
         "drupal/flood_control": "^2.1",
@@ -340,6 +340,7 @@
         "drupal/viewsreference": "^2.0",
         "drupal/webform": "^6.0",
         "drupal/webform_migrate": "dev-1.x#2638e99",
+        "drupal/webform_validation": "^2.0@alpha",
         "drupal_git/custom_add_another": "1.x-dev",
         "drupal_git/date_range_formatter": "3.x-dev",
         "drupal_git/token_formatters": "^1.0",
@@ -359,7 +360,7 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
-        "drupal/core-dev": "~9.4.7",
+        "drupal/core-dev": "~9.4.10",
         "mglaman/phpstan-drupal": "^1.1",
         "phpstan/extension-installer": "^1.2",
         "phpstan/phpstan": "^1.9",
@@ -387,7 +388,8 @@
             "zaporylie/composer-drupal-optimizations": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "wikimedia/composer-merge-plugin": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "drupal/core-project-message": true
         }
     },
     "autoload": {