dof-dss
diff --git a/‎.circleci/config.yml
+48-46 b/‎.circleci/config.yml
+48-46
diff --git a/‎.platform.app.yaml
-6 b/‎.platform.app.yaml
-6
diff --git a/‎composer.json
+43-33 b/‎composer.json
+43-33
@@ -55,6 +55,23 @@ commands:
             sudo apt-get install -y libpng-dev
             sudo docker-php-ext-install gd
             composer global require hirak/prestissimo
+  install_platformsh_tools:
+    description: "Install packages and tools for interacting with platform.sh API"
+    steps:
+      - run:
+          name: Add extra OS and PHP extensions/config
+          command: |
+            sudo docker-php-ext-install pcntl posix
+      - run:
+          name: Keyscan Platform.sh region hostnames + GitHub for password-less access
+          command: |
+            mkdir -p ~/.ssh
+            ssh-keyscan -H ssh.$PLATFORM_REGION >> ~/.ssh/known_hosts
+            ssh-keyscan -H github.com >> ~/.ssh/known_hosts
+      - run:
+          name: Install the Platform.sh CLI tool
+          command: |
+            curl -sS https://platform.sh/cli/installer | php
   github_hosts_workaround:
     description: "Adds github.com to known hosts in container; for working locally."
     steps:
@@ -97,7 +114,7 @@ jobs:
           paths:
             - ./
 
-  # Test for coding standards and deprecated code.
+  # Test for coding standards.
   static_analysis:
     docker:
       - image: circleci/php:7.3.14-apache-browsers
@@ -108,11 +125,6 @@ jobs:
       - run:
           name: PHPCS static analysis
           command: /home/circleci/project/phpcs.sh /home/circleci/project "/home/circleci/project/web/modules/origins /home/circleci/project/web/modules/custom /home/circleci/project/web/modules/migrate /home/circleci/project/web/themes/custom"
-      - run:
-          name: Deprecated code check
-          command: |
-            cd /home/circleci/project
-            vendor/bin/drupal-check /home/circleci/project/web/modules/custom /home/circleci/project/web/modules/origins -e "*/tests/src/*"
 
   # Run any unit tests and any kernel tests against a vanilla D8 site + our site config imported over it (no predefined content).
   unit_kernel_tests:
@@ -247,20 +259,7 @@ jobs:
       - attach_workspace:
           at: ./
       - install_php_os_extensions
-      - run:
-          name: Add extra OS and PHP extensions/config
-          command: |
-            sudo docker-php-ext-install pcntl posix
-      - run:
-          name: Keyscan Platform.sh region hostnames + GitHub for password-less access
-          command: |
-            mkdir -p ~/.ssh
-            ssh-keyscan -H ssh.$PLATFORM_REGION >> ~/.ssh/known_hosts
-            ssh-keyscan -H github.com >> ~/.ssh/known_hosts
-      - run:
-          name: Install the Platform.sh CLI tool
-          command: |
-            curl -sS https://platform.sh/cli/installer | php
+      - install_platformsh_tools
       - run:
           name: Re-point dof-dss packages to use latest development code and push.
           command: |
@@ -287,6 +286,26 @@ jobs:
               echo "No active environment for $EDGE_BUILD_BRANCH found, attempt to activate one."
               /home/circleci/.platformsh/bin/platform environment:activate -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH -y
             fi
+      - persist_to_workspace:
+          root: ./
+          paths:
+            - ./
+
+  # Code analysis using upgrade_status module; run against platform.sh environment because
+  # initiating/installing against Circle CI containers takes a long time indeed.
+  code_analysis:
+    docker:
+      - image: circleci/php:7.3.14-apache-browsers
+    steps:
+      - attach_workspace:
+          at: ./
+      - install_php_os_extensions
+      - install_platformsh_tools
+      - run:
+          name: "Invoke upgrade_status drush command"
+          command: |
+            /home/circleci/.platformsh/bin/platform environment:drush "en upgrade_status -y" -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
+            /home/circleci/.platformsh/bin/platform environment:drush "upgrade_status:analyze --all --ignore-contrib --ignore-uninstalled" -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
 
   # Separate task to allow us to sync data on PSH environments, without pauses in other jobs.
   sync_data:
@@ -300,19 +319,7 @@ jobs:
             cd ~/project
             git checkout -b $EDGE_BUILD_BRANCH
       - install_php_os_extensions
-      - run:
-          name: Add extra OS and PHP extensions/config
-          command: |
-            sudo docker-php-ext-install pcntl posix
-      - run:
-          name: Keyscan Platform.sh region hostnames for password-less access
-          command: |
-            mkdir -p ~/.ssh
-            ssh-keyscan -H ssh.$PLATFORM_REGION >> ~/.ssh/known_hosts
-      - run:
-          name: Install the Platform.sh CLI tool
-          command: |
-            curl -sS https://platform.sh/cli/installer | php
+      - install_platformsh_tools
       - run:
           name: Trigger a data sync from master environment to nightly edge build.
           command: |
@@ -325,6 +332,10 @@ jobs:
           name: Refresh configuration as our db will contain active prod config after sync operation
           command: |
             /home/circleci/.platformsh/bin/platform environment:drush cim -y -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
+      - run:
+          name: Run structure sync import all
+          command: |
+            /home/circleci/.platformsh/bin/platform environment:drush "ia --choice=safe" -y -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH
       - run:
           name: Force purge of Solr index
           command: /home/circleci/.platformsh/bin/platform ssh -p $PLATFORM_PROJECT_ID -e $EDGE_BUILD_BRANCH "curl http://${PLATFORM_SOLR_HOST}/solr/default/update --data '<delete><query>*:*</query></delete>' -H 'Content-type:text/xml; charset=utf-8' && curl http://${PLATFORM_SOLR_HOST}/solr/default/update --data '<commit/>' -H 'Content-type:text/xml; charset=utf-8'"
@@ -343,19 +354,7 @@ jobs:
     steps:
       - checkout_code
       - install_php_os_extensions
-      - run:
-          name: Add extra OS and PHP extensions/config
-          command: |
-            sudo docker-php-ext-install pcntl posix
-      - run:
-          name: Keyscan Platform.sh region hostnames for password-less access
-          command: |
-            mkdir -p ~/.ssh
-            ssh-keyscan -H ssh.$PLATFORM_REGION >> ~/.ssh/known_hosts
-      - run:
-          name: Install the Platform.sh CLI tool
-          command: |
-            curl -sS https://platform.sh/cli/installer | php
+      - install_platformsh_tools
       - run:
           name: Fetch database and managed files from NIDirect D7
           command: |
@@ -403,6 +402,9 @@ workflows:
       - edge_build:
           requires:
             - build
+      - code_analysis:
+          requires:
+            - edge_build
 
   # A separate scheduled workflow to sync the data after the nightly build completes.
   # This is separate to avoid using build time/compute units with arbitrary sleep commands;
 
@@ -135,9 +135,3 @@ web:
         # Provide a longer TTL (2 weeks) for aggregated CSS and JS files.
         '^/sites/default/files/(css|js)':
           expires: 2w
-
-# The configuration of scheduled execution.
-crons:
-  drupal:
-    spec: '*/5 * * * *'
-    cmd: 'cd web ; drush core-cron'
@@ -27,14 +27,14 @@
         }
     ],
     "require": {
-        "composer/installers": "^1.2",
+        "composer/installers": "v1.7.0",
         "cweagans/composer-patches": "^1.6.5",
-        "dof-dss/nicsdru_nidirect_theme": "^0.11.16",
-        "dof-dss/nicsdru_origins_modules": "^0.9.11",
-        "dof-dss/nicsdru_origins_theme": "^0.3.3",
+        "dof-dss/nicsdru_nidirect_theme": "^0.12.1",
+        "dof-dss/nicsdru_origins_modules": "^0.9.13",
+        "dof-dss/nicsdru_origins_theme": "^0.3.9",
         "dof-dss/nidirect-d8-test-install-profile": "^0.2.2",
-        "dof-dss/nidirect-migrations": "^0.11.14",
-        "dof-dss/nidirect-site-modules": "^0.11.15",
+        "dof-dss/nidirect-migrations": "^0.12.1",
+        "dof-dss/nidirect-site-modules": "^0.12.1",
         "drupal/address": "^1.7",
         "drupal/admin_toolbar": "^2.0",
         "drupal/adminimal_theme": "^1.5",
@@ -43,41 +43,42 @@
         "drupal/block_list_override": "^1.0",
         "drupal/chosen": "^3.0",
         "drupal/chosen_lib": "^3.0",
-        "drupal/clientside_validation": "^2.0",
+        "drupal/clientside_validation": "^3.0@RC",
         "drupal/config_filter": "^1.4",
         "drupal/config_ignore": "^2.1",
         "drupal/config_readonly": "^1.0@beta",
         "drupal/config_split": "^2.0.0",
         "drupal/config_update": "^1.6",
         "drupal/console": "^1.9",
-        "drupal/core-composer-scaffold": "^8.8",
-        "drupal/core-project-message": "^8.8",
-        "drupal/core-recommended": "^8.8",
-        "drupal/csv_serialization": "^1.4",
+        "drupal/core-composer-scaffold": "^8.9.13",
+        "drupal/core-project-message": "^8.9.13",
+        "drupal/core-recommended": "^8.9.13",
+        "drupal/csv_serialization": "^2.0@beta",
         "drupal/diff": "^1.0",
         "drupal/entity_browser": "^2.5",
         "drupal/entity_embed": "^1.0",
         "drupal/entity_reference_unpublished": "^1.2",
         "drupal/entityqueue": "^1.0",
         "drupal/eu_cookie_compliance": "^1.8",
-        "drupal/facets": "^1.4",
-        "drupal/facets_pretty_paths": "^1.0@beta",
+        "drupal/facets": "1.5",
+        "drupal/facets_pretty_paths": "1.x-dev",
         "drupal/fastly": "^3.9",
         "drupal/field_group": "^3.0",
         "drupal/flag": "4.x-dev",
-        "drupal/geocoder": "^2.5",
+        "drupal/geocoder": "^3.14",
         "drupal/geolocation": "3.x",
         "drupal/google_analytics_counter": "3.x-dev",
         "drupal/handy_cache_tags": "^1.0",
-        "drupal/hms_field": "^1.0@beta",
-        "drupal/http_cache_control": "^1.0",
+        "drupal/hms_field": "1.x-dev",
+        "drupal/http_cache_control": "^2.0",
         "drupal/inline_entity_form": "^1.0@RC",
         "drupal/layout_builder_modal": "^1.0@alpha",
         "drupal/layout_builder_restrictions": "^2.2",
         "drupal/linkit": "^6.0.0",
         "drupal/media_library_edit": "^2.0",
         "drupal/metatag": "^1.8",
-        "drupal/migrate_absolute_links": "1.x-dev",
+        "drupal/migrate_absolute_links": "^2.1",
+        "drupal/migrate_plus": "^5.1",
         "drupal/migrate_upgrade": "^3.2",
         "drupal/moderation_sidebar": "^1.3",
         "drupal/node_edit_protection": "^1.0",
@@ -86,7 +87,7 @@
         "drupal/pathauto": "^1.4",
         "drupal/redirect": "^1.5",
         "drupal/redis": "^1.4",
-        "drupal/scheduled_transitions": "^1.1",
+        "drupal/scheduled_transitions": "^2.0@beta",
         "drupal/scheduler": "^1.1",
         "drupal/scheduler_content_moderation_integration": "^1.1",
         "drupal/schema_metatag": "^2.1",
@@ -100,41 +101,42 @@
         "drupal/sitewide_alert": "^1.3",
         "drupal/smart_trim": "^1.2",
         "drupal/structure_sync": "^2.0",
-        "drupal/taxonomy_access_fix": "^2.6",
+        "drupal/taxonomy_access_fix": "^3.1",
+        "drupal/taxonomy_entity_index": "^1.7",
         "drupal/telephone_plus": "^9.1",
         "drupal/token": "^1.5",
         "drupal/token_filter": "^1.1",
-        "drupal/twig_extensions": "^2.0",
-        "drupal/twig_field_value": "^1.2",
+        "drupal/twig_extensions": "2.x-dev@dev",
+        "drupal/twig_field_value": "^2.0",
         "drupal/twig_tweak": "^2.4",
         "drupal/ultimate_cron": "^2.0@alpha",
         "drupal/views_contextual_filters_or": "^1.1",
         "drupal/views_custom_cache_tag": "^1.1",
         "drupal/views_data_export": "^1.0",
-        "drupal/webform": "^5.23-beta1",
+        "drupal/webform": "^6.0",
         "drupal/whatlinkshere": "^1.6",
         "drupal/xls_serialization": "^1.2",
         "drush/drush": "^10.1",
         "harvesthq/chosen": "^1.8",
+        "kint-php/kint": "^3.3",
         "oomphinc/composer-installers-extender": "^2.0",
         "platformsh/config-reader": "^2.3",
         "solarium/solarium": "6",
-        "symfony/event-dispatcher": "4.3.11 as 3.4.35",
+        "symfony/event-dispatcher": "4.3.11 as 3.4.41",
         "vlucas/phpdotenv": "^2.4",
         "zaporylie/composer-drupal-optimizations": "^1.0"
     },
     "require-dev": {
         "drupal/core-dev": "^8.8",
-        "drupal/devel": "^2.1",
+        "drupal/devel": "^4.1",
         "drupal/easy_install": "^10.1",
         "drupal/masquerade": "^2.0@beta",
-        "drupal/migrate_plus": "^4.2",
         "drupal/migrate_tools": "4.x-dev",
-        "drupal/multiline_config": "^1.0",
+        "drupal/multiline_config": "1.x-dev",
         "drupal/permissions_filter": "^1.1",
         "drupal/restui": "^1.17",
         "drupal/stage_file_proxy": "^1.0@beta",
-        "mglaman/drupal-check": "^1.1",
+        "drupal/upgrade_status": "^3.0",
         "previousnext/phpunit-finder": "^1.0@alpha"
     },
     "conflict": {
@@ -151,7 +153,6 @@
             "drupal/core": {
                 "Prevent leftover fields from causing errors like 'Call to a member function getLabel() after enabling layout_builder'": "https://www.drupal.org/files/issues/2020-01-20/2985882-53.patch",
                 "When embedding media, don't let authors choose view modes that are not enabled for that media type": "https://www.drupal.org/files/issues/2020-01-31/3097416-ckeditor-view-modes-8.9-combined.patch",
-                "Prevent error when saving unpublished content for users without manage book privileges": "https://www.drupal.org/files/issues/2918537-36.patch",
                 "[IGNORE] Composer-friendly patches for filename sanitation while #2492171 awaits #3032390": "https://www.drupal.org/files/issues/2020-11-18/3094052-composer-patch-filename-sanitation-7.patch",
                 "[meta] Themes improperly check renderable arrays when determining visibility": "https://www.drupal.org/files/issues/2019-02-19/themes_improperly_check_renderable_arrays_when_determining_visibility-953034-313.patch",
                 "Off-canvas style resets are overriding styles (especially SVGs) in Safari, Firefox and Chromium Edge resulting in display issues": "https://www.drupal.org/files/issues/2021-01-06/off-canvas-style-resets-2958588-13.patch"
@@ -160,15 +161,12 @@
                 "Handle missing core version": "https://www.drupal.org/files/issues/2019-12-19/easy_install_core_version-3101883-0.patch"
             },
             "drupal/google_analytics_counter": {
-                "Add API query tweak options": "https://gist.githubusercontent.com/omahm/02ac3b7138c4d0518bd954721b74b763/raw/8d7ffa08b21359c7bf11165cdef1fb7e98483774/gac_query_options.patch"
+                "Add API query tweak options": "https://gist.githubusercontent.com/omahm/02ac3b7138c4d0518bd954721b74b763/raw/8d7ffa08b21359c7bf11165cdef1fb7e98483774/gac_query_options.patch",
+                "Drupal 8.9 / 9 compatibility 1": "https://www.drupal.org/files/issues/2020-06-06/interdiff_3146542-7-8.txt"
             },
             "drupal/redirect": {
                 "URL redirects listing only displays operations": "https://www.drupal.org/files/issues/2019-04-05/redirects_list_builder-3031125-9-d8.patch"
             },
-            "drupal/clientside_validation": {
-                "Clientside validation errors revert to being output as a label in webform wizard pages with ajax enabled": "https://www.drupal.org/files/issues/2020-02-03/cvjquery-ajax-webform-wizard.patch",
-                "Fix LinkIt module errors": "https://gist.githubusercontent.com/omahm/5a162e438abb89403dac459e7f2d7597/raw/78dac8ddc3f4e1c32289fc23293f91faaf329548/3124809.patch"
-            },
             "drupal/password_policy": {
                 "field_last_password_reset is unknown while importing configuration on site without password_policy activated": "https://www.drupal.org/files/issues/2020-01-17/password_policy-n2771129-109.patch"
             },
@@ -178,6 +176,9 @@
             "drupal/shs": {
                 "SHS select is empty on views": "https://www.drupal.org/files/issues/2018-12-10/shs-blank-select-fix-3019378-3.patch"
             },
+            "drupal/scheduled_transitions": {
+                "Make revisions in any language available for scheduling": "https://www.drupal.org/files/issues/2021-02-05/scheduled_transitions_base_language_3091006_1x.patch"
+            },
             "drupal/schema_metatag": {
                 "Add @id as a tag to all schemas": "https://www.drupal.org/files/issues/2019-09-01/3078582-02.patch"
             },
@@ -196,6 +197,15 @@
             },
             "drupal/whatlinkshere": {
                 "Incorrect batch id in drush command": "https://www.drupal.org/files/issues/2021-01-26/fix-batch-id-ref.patch"
+            },
+            "drupal/hms_field": {
+                "Drupal 8.9 / 9 compatibility": "https://www.drupal.org/files/issues/2020-06-05/3145496-6.patch"
+            },
+            "drupal/multiline_config": {
+                "Drupal 8.9 / 9 compatibility": "https://www.drupal.org/files/issues/2021-01-12/3109713-16.patch"
+            },
+            "drupal/structure_sync": {
+                "Drupal 8.9 / 9 compatibility": "https://www.drupal.org/files/issues/2020-11-30/structure_sync-3141810-9.patch"
             }
         },
         "composer-exit-on-patch-failure": true,