Merge pull request #1219 from dof-dss/release-3.0.5

Release 3.0.5
dof-dss · Jun 3, 2024 · 9489806 · 9489806
2 parents 0fdcdd6 + f407100
commit 9489806
Show file tree

Hide file tree

Showing 80 changed files with 5,608 additions and 28,247 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -116,6 +116,20 @@ jobs:
             CHECK_DIRS="$CHECK_DIRS ${PROJECT_ROOT}/web/themes/custom"
             vendor/bin/drupal-check $CHECK_DIRS
 
+  disallowed_functions:
+    <<: *docker_image
+    steps:
+      - attach_workspace:
+          at: ./
+      - run:
+          name: Check for disallowed function calls
+          command: |
+            cd $PROJECT_ROOT
+            CHECK_DIRS="${PROJECT_ROOT}/web/modules/custom"
+            CHECK_DIRS="$CHECK_DIRS ${PROJECT_ROOT}/web/modules/origins"
+            CHECK_DIRS="${PROJECT_ROOT}/web/themes/custom"
+            vendor/bin/phpstan analyse $CHECK_DIRS -c .circleci/phpstan.neon
+
   # Functional tests with headless browser; run against our edge environment.
   functional_tests:
     docker:
@@ -267,6 +281,35 @@ jobs:
               }
             }'
 
+
+  # Ensure defined PSH environments remain awake.
+  env_caffeine:
+    <<: *docker_image
+    environment:
+      # Comma separated list of envs to keep alive.
+      # Platformsh CLI token and project id securely
+      # injected from Circle CI env variable storage.
+      KEEP_ALIVE_ENVS: "prison-visits-online-form"
+    steps:
+      - checkout_code
+      - install_psh_cli
+      - run:
+          name: Keep alive envs
+          command: |
+            # Take env var and add to shell array variable to loop over later.
+            IFS=', ' read -r -a envs \<<< "$KEEP_ALIVE_ENVS"
+            for env in "${envs[@]}"; do
+              platform environment:resume -p $PLATFORM_PROJECT -e $env -y
+            done
+
+            exit_code=$?
+            # Adjust exit code to 0 if non-zero
+            if [ $exit_code -ne 0 ]; then
+              echo "Environment resume command exited with non-zero exit code, catching to avoid false error on CI task"
+              exit_code=0
+            fi
+            exit $exit_code
+
 workflows:
   version: 2
   # Our default pipeline that tests the integrity of our code.
@@ -279,6 +322,9 @@ workflows:
       - deprecated_code:
           requires:
             - build
+      - disallowed_functions:
+          requires:
+            - build
 
   # Workflow that instructs New Relic about new release tags in the repo.
   release-marker:
@@ -318,17 +364,15 @@ workflows:
     jobs:
       - sync_data
 
-  # A workflow to execute our functional tests against our edge branch environment.
-#  functional-tests:
-#    triggers:
-#      - schedule:
-#          cron: "0 2 * * 1-5"
-#          filters:
-#            branches:
-#              only:
-#                - D8NID-edge
-#    jobs:
-#      - build
-#      - functional_tests:
-#          requires:
-#            - build
+  # Workflow which re-activates any defined paused environments on platform.sh
+  environment-stay-awake:
+    triggers:
+      - schedule:
+          # “At 05:00 on Sunday.”
+          cron: "0 5 * * 0"
+          filters:
+            branches:
+              only:
+                - development
+    jobs:
+      - env_caffeine
diff --git a/.circleci/phpstan.neon b/.circleci/phpstan.neon
@@ -0,0 +1,30 @@
+parameters:
+  customRulesetUsed: true
+  reportUnmatchedIgnoredErrors: false
+  ignoreErrors:
+    - '#\Drupal calls should be avoided in classes, use dependency injection instead#'
+    - '#Plugin definitions cannot be altered.#'
+    - '#Missing cache backend declaration for performance.#'
+    - '#Plugin manager has cache backend specified but does not declare cache tags.#'
+  disallowedFunctionCalls:
+    - function: var_dump
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: dump
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: kint
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: ksm
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: die
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+    - function: exit
+      message: 'This is likely not intended to be used outside of local development, please remove it.'
+  fileExtensions:
+    - module
+    - theme
+    - inc
+    - install
+    - profile
+    - engine
+  paths:
+    - src
diff --git a/composer.json b/composer.json
@@ -44,23 +44,23 @@
         "ext-simplexml": "*",
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.6.5",
-        "dof-dss/nicsdru_origins_modules": "^10",
+        "dof-dss/nicsdru_origins_modules": "^10.3",
         "dof-dss/nicsdru_origins_theme": "^10",
-        "drupal/address": "^1.7",
+        "drupal/address": "^2.0",
         "drupal/admin_toolbar": "^3.2",
         "drupal/adminimal_theme": "^1.7",
         "drupal/advban": "^1.5",
-        "drupal/antibot": "^2.0",
+        "drupal/antibot": "2.0.2",
         "drupal/autoban": "^1.8",
         "drupal/block_content_permissions": "^1.10",
         "drupal/block_field": "^1.0@RC",
         "drupal/block_list_override": "^1.0",
-        "drupal/chosen": "^3.0",
-        "drupal/chosen_lib": "^3.0",
+        "drupal/chosen": "^4.0",
+        "drupal/chosen_lib": "^4.0",
         "drupal/ckeditor": "^1.0",
         "drupal/clientside_validation": "^4.0",
         "drupal/config_filter": "^2.5",
-        "drupal/config_ignore": "^2.1",
+        "drupal/config_ignore": "^3.2",
         "drupal/config_readonly": "^1.0@beta",
         "drupal/config_split": "^2.0-beta",
         "drupal/config_update": "^2.0@alpha",
@@ -70,11 +70,11 @@
         "drupal/core-project-message": "10.1.8",
         "drupal/core-recommended": "10.1.8",
         "drupal/csp": "^1.15",
-        "drupal/csv_serialization": "^3.0",
-        "drupal/ctools": "^3.7",
+        "drupal/csv_serialization": "^4.0",
+        "drupal/ctools": "^4.0",
         "drupal/diff": "^1.0",
-        "drupal/dynamic_entity_reference": "^3.1",
-        "drupal/easy_google_analytics_counter": "^2.0",
+        "drupal/dynamic_entity_reference": "^3.2",
+        "drupal/easy_google_analytics_counter": "^3.0",
         "drupal/entity_browser": "^2.6",
         "drupal/entity_embed": "^1.2",
         "drupal/entity_reference_unpublished": "^2.0",
@@ -92,18 +92,21 @@
         "drupal/filelog": "^2.1",
         "drupal/flag": "4.x-dev",
         "drupal/geocoder": "^4.10",
-        "drupal/geolocation": "3.x",
-        "drupal/google_tag": "^1.4",
+        "drupal/geolocation": "^4.0@alpha",
+        "drupal/google_tag": "^2.0",
         "drupal/handy_cache_tags": "^1.0",
         "drupal/honeypot": "^2.0",
         "drupal/http_cache_control": "^2.0",
-        "drupal/inline_entity_form": "^1.0.0-rc9",
+        "drupal/inline_entity_form": "^3.0",
+        "drupal/jquery_ui": "^1.6",
+        "drupal/jquery_ui_autocomplete": "^2.0",
+        "drupal/jquery_ui_menu": "^2.0",
         "drupal/layout_builder_modal": "^1.0@alpha",
         "drupal/layout_builder_restrictions": "^2.9",
         "drupal/linkit": "^6.0.0",
         "drupal/media_file_delete": "^1.1",
         "drupal/media_library_edit": "^3.0",
-        "drupal/metatag": "^1.8",
+        "drupal/metatag": "^2.0",
         "drupal/migrate_plus": "^6.0",
         "drupal/migrate_tools": "^6.0",
         "drupal/moderation_sidebar": "^1.3",
@@ -114,9 +117,9 @@
         "drupal/permissions_filter": "^1.2",
         "drupal/redirect": "^1.9",
         "drupal/redis": "^1.5",
-        "drupal/scheduled_transitions": "^2.1",
-        "drupal/scheduler": "^1.4",
-        "drupal/schema_metatag": "^2.2",
+        "drupal/scheduled_transitions": "^2.4",
+        "drupal/scheduler": "^2.0",
+        "drupal/schema_metatag": "^3.0",
         "drupal/search_api": "^1.26",
         "drupal/search_api_autocomplete": "^1.7",
         "drupal/search_api_location": "^1.0@alpha",
@@ -132,7 +135,7 @@
         "drupal/structure_sync": "^2.0",
         "drupal/taxonomy_access_fix": "^4.0",
         "drupal/taxonomy_entity_index": "^1.7",
-        "drupal/telephone_plus": "^2.0@beta",
+        "drupal/telephone_plus": "^9.1",
         "drupal/token": "^1.13",
         "drupal/token_filter": "^2.1",
         "drupal/twig_field_value": "^2.0",
@@ -156,6 +159,7 @@
         "vlucas/phpdotenv": "^2.4"
     },
     "require-dev": {
+        "drupal/coder": "^8.3",
         "drupal/devel": "^5.0",
         "drupal/easy_install_d10": "^10.0@dev",
         "drupal/fpa": "^4.0",
@@ -164,7 +168,11 @@
         "drupal/restui": "^1.17",
         "drupal/stage_file_proxy": "^2.1",
         "kint-php/kint": "^4.2",
-        "mglaman/drupal-check": "^1.4"
+        "mglaman/drupal-check": "^1.4",
+        "phpspec/prophecy-phpunit": "^2.1",
+        "phpstan/extension-installer": "^1.3",
+        "previousnext/phpunit-finder": "^2.0",
+        "spaze/phpstan-disallowed-calls": "^3.1"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -189,9 +197,6 @@
     },
     "extra": {
         "patches": {
-            "drupal/address": {
-                "Allow to set a list of preferred countries": "https://www.drupal.org/files/issues/2019-11-11/2626982-37.preferred_countries.patch"
-            },
             "drupal/antibot": {
                 "Antibot blocks multistep webform submission if user fails to move mouse pointer": "https://www.drupal.org/files/issues/2023-12-06/antibot-issue-3406484-2.patch"
             },
@@ -242,10 +247,7 @@
                 "Empty query params on source cause TypeError": "https://www.drupal.org/files/issues/2022-10-25/3315928-7-redirect-empty-source-query-options.patch"
             },
             "drupal/scheduled_transitions": {
-                "Add pagination to target revision candidates list": "https://www.drupal.org/files/issues/2023-11-20/3241497-12.patch"
-            },
-            "drupal/ultimate_cron": {
-                "Apply entityQuery accessCheck CR #3334805": "https://www.drupal.org/files/issues/2023-10-31/ultime-cron-entity-query-3334805-5.patch"
+                "Add pagination to target revision candidates list": "https://www.drupal.org/files/issues/2024-02-01/scheduled_transitions-page-revisions-3241497-13.patch"
             }
         },
         "composer-exit-on-patch-failure": true,