WorkBC24-R7 TESTv3 (#704)

* [WBCAMS-547] Fix icons and images on card icons in mobile view * Update dependencies * [WBCAMS-547] Fix img centering and ensure svg aren't affected by changes * [NOC-482] Update dependencies * [WBCAMS-521,541,542,543] Career Trek / Video Library changes (#665) * Career Trek Video page updates * Canonical Drupal hook documentation * remove stray config settings files * Recently added * Recently added, 2 * Skills, not Skill * Button styling * Update skills field config * field_skills => field_skills_2 --------- Co-authored-by: rjkuyvenhoven <[email protected]> * [WBCAMS-541] pass Skill name to Term loadByProperties() function. (#667) * [WBCAMS-542] Better recently added redirection * [NOC-542] Add patch to allow form redirections * [WBCAMS-543] Don't display NOC for non-career videos * [WBCAMS-542] Filter label change * [WBCAMS-542] Disable BigPipe completely for Career Trek page * [WBCAMS-557] - Add meta tags and meta tag descriptions fields to other Drupal pages (#675) * Meta Tag Description for Profile & Work Centre pages * remove metatag description from display * [WBCAMS-554] remove Author from Success Story pages (#676) * [WBCAMS-544] add Revision author to content & moderated content views (#677) * [WBCAMS-557] metatag keywords (#678) * add Tags field to BC, Region, Career Profile & Industry Profiles, Labour Market Monthly & WorkBC Centre content types. Configure metatag module to use Tags field to provide meta keywords * update field label & description * Update autoscaling.tf * [NOC-590 / WBCAMS-633] LMMU GitHub workflow and sources changes (#679) * [WBCAMS-657] Update dependencies * [WBCAMS-633] Validate file timestamp * [WBCAMS-633] Fix workbc-ssot branch for DEV/TEST * [WBCAMS-455] upgrade Bootstrap5 (#681) * [WBCAMS-455] disable CKEditor, Color and RDF deprecated modules (#682) * WBCAMS-557 enable auto create tags for BC, Region, Career, Industry profiles, Labour Market Month and WorkBC Center metatag keyword fields (#683) * [WBCAMS-455] disable meda_entity_dlcke module (#685) * [WBCAMS-455] drupal 9 uninstall modules (#686) * update user roles * uninstall admin_toolbar_links_acces_filter & tour modules * Prevent views_bulk_operations from upgrading while we migrate to D10 * [WBCAMS-455] Drupal 10 upgrade (#687) * Update Dockerfile * Adjust drush deployment sequence and remove deprecated CAREERTREK_URL (#690) * [WBCAMS-688] upgrade ckeditor media resize module with patch applied (#689) * upgrade ckeditor media resize module with patch applied * move ckeditor_media-resize module location * [WBCAMS-688] update GeoLocation and Queue UI modules (#691) * Update Dockerfile * Adjust SSOT linkages to various environments * [WBCAMS-688] module upgrades (#692) * prevent D10 from automatically upgrading past v10.3.6 * disable actions_permissions module * [WBCAMS-688] update country module (#693) * Update efs3.tf * update ckeditor_media_resize module * [WBCAMS 688] core module updates (#694) * upgrade Views Bulk Operations * enable and configure actions_permissions module * Squashed commit of the following: commit 0a7852b549578e577aa8835d3585cafa4ba9474b Author: rjkuyvenhoven <[email protected]> Date: Wed Nov 13 10:38:21 2024 -0800 core & module updates commit 688ff58c14fb886882be9d2921f1fa5211c48a5b Author: rjkuyvenhoven <[email protected]> Date: Wed Nov 13 09:49:47 2024 -0800 update core and media entity download module commit 2bf32c7dc9f7a18f8ae3c9171651f16e93c38f2c Author: rjkuyvenhoven <[email protected]> Date: Fri Nov 8 16:08:02 2024 -0800 update core to 10.3.7 * [WBCAMS-600] limit 50+ filter to 2500 too exclude annual salary values (#695) * [WBCAMS-607] Career Profile extra field allowing search indexing to include "NOC" text (#696) * [WBCAMS-607] remove NOC Search Index field from default view mode (#697) * [WBCAMS-729] search common job titles (#698) * add Common Job Titles to career profile search index * Hide unneeded fields --------- Co-authored-by: infojunkie <[email protected]> * Update dependencies * update WorkBC theme info * fix configuration * Missing configuration export * Update WorkBC theme info to prevent further Bootstrap5 files * Trigger Build * [WBCAMS-455] bootstrap version updates (#699) * add Bootstrap 5.1.3 core to WorkBC custom theme * remove unneeded files * [WBCAMS-688] upgrade to Drupal 10.3.9 (#700) * [WBCAMS-746] Add validation rule * [WBCAMS-688] core (10.3.10) & module updates (#701) * Module updates * update core and modules * [WBCAMS-68] latest module updates (#703) * [WBCAMS-688] resolve insecure randomness issue (#705) --------- Co-authored-by: rjkuyvenhoven <[email protected]> Co-authored-by: vmuchalla <[email protected]>
bcgov · Dec 4, 2024 · 8cef264 · 8cef264
1 parent e84ce9d
commit 8cef264
Show file tree

Hide file tree

Showing 1,024 changed files with 154,151 additions and 13,004 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,4 @@
-FROM 075458558257.dkr.ecr.ca-central-1.amazonaws.com/drupal-base:4.2
-COPY src /code
+FROM 075458558257.dkr.ecr.ca-central-1.amazonaws.com/drupal-base:6.2
 ARG GITHUB_SHA=unknown
 ENV GITHUB_SHA=$GITHUB_SHA
 
@@ -9,6 +8,7 @@ ARG START_SERVERS
 ARG MIN_SPARE
 ARG MAX_SPARE
 ARG SPAWN_RATE
+ENV COMPOSER_ALLOW_SUPERUSER=1
 RUN sed -i '/;slowlog/c\slowlog = /var/log/slow.log' /usr/local/etc/php-fpm.d/www.conf
 RUN sed -i "/;request_slowlog_timeout/c\request_slowlog_timeout = $TIMEOUT" /usr/local/etc/php-fpm.d/www.conf
 RUN sed -i "/pm.max_children = 5/c\pm.max_children = $MAX_CHILDREN" /usr/local/etc/php-fpm.d/www.conf
@@ -17,5 +17,7 @@ RUN sed -i "/pm.min_spare_servers = 1/c\pm.min_spare_servers = $MIN_SPARE" /usr/
 RUN sed -i "/pm.max_spare_servers = 3/c\pm.max_spare_servers = $MAX_SPARE" /usr/local/etc/php-fpm.d/www.conf
 RUN sed -i "/;pm.max_spawn_rate/c\pm.max_spawn_rate = $SPAWN_RATE" /usr/local/etc/php-fpm.d/www.conf
 
+COPY src /code
 RUN chmod -R g+rwX /code
 RUN cd /code && rm -rf .git && composer install && composer update
+RUN ln -s /app/vendor/drush/drush/drush /usr/local/bin/drush
diff --git a/src/.gitattributes b/src/.gitattributes
@@ -42,6 +42,9 @@
 *.xml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 *.yml     text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
 
+# PHPStan's baseline uses tabs instead of spaces.
+core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php
+
 # Define binary file attributes.
 # - Do not treat them as text.
 # - Include binary diff in patches instead of "binary files differ."

diff --git a/src/composer.json b/src/composer.json
@@ -72,32 +72,33 @@
         "aws/aws-sdk-php": "~3.0",
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
-        "drupal/address": "^1.10",
-        "drupal/admin_toolbar": "^3.1",
-        "drupal/advagg": "^5.0",
+        "drupal/address": "^2.0",
+        "drupal/admin_toolbar": "^3.5",
+        "drupal/advagg": "^6.0@alpha",
         "drupal/auto_username": "^1.2",
         "drupal/backup_migrate": "^5.0",
         "drupal/backup_migrate_aws_s3": "^5.0",
         "drupal/better_social_sharing_buttons": "^4.0",
         "drupal/block_visibility_conditions": "1.x-dev#89c578b252af0d99c832af5b6c6ee4d52b6490d1",
         "drupal/bootstrap5": "^3.0",
-        "drupal/cache_control_override": "^1.1",
-        "drupal/cancel_button": "^1.3",
-        "drupal/captcha": "^1.4",
-        "drupal/cdn": "^3.5",
+        "drupal/cache_control_override": "^1.1 || ^2.0",
+        "drupal/cancel_button": "^1.5",
+        "drupal/captcha": "^2.0",
         "drupal/charts": "^5.0",
         "drupal/chosen": "^4.0",
-        "drupal/config_filter": "~1",
-        "drupal/config_ignore": "^2.3",
-        "drupal/console": "~1.0",
+        "drupal/ckeditor_media_resize": "^1.0",
+        "drupal/config_filter": "^2.7",
+        "drupal/config_ignore": "^3.3",
         "drupal/content_lock": "^2.2",
         "drupal/content_moderation_notifications": "^3.4",
-        "drupal/core-composer-scaffold": "~9.5.0",
-        "drupal/core-recommended": "~9.5.0",
-        "drupal/country": "^1.0",
+        "drupal/core-composer-scaffold": "~10.3.10",
+        "drupal/core-project-message": "~10.3.10",
+        "drupal/core-recommended": "~10.3.10",
+        "drupal/country": "^2.1",
         "drupal/crop": "^2.2",
-        "drupal/devel": "^4.1",
-        "drupal/devel_kint_extras": "^1.0",
+        "drupal/devel": "~5.2.1",
+        "drupal/devel_kint_extras": "^1.1",
+        "drupal/devel_php": "^1.7",
         "drupal/duration_field": "^2.0",
         "drupal/easy_breadcrumb": "^2.0",
         "drupal/editor_advanced_link": "^2.2",
@@ -106,59 +107,61 @@
         "drupal/extra_field": "^2.2",
         "drupal/field_group": "^3.2",
         "drupal/field_permissions": "^1.1",
-        "drupal/filehash": "^2.0",
-        "drupal/flood_control": "^2.2",
-        "drupal/fpa": "^3.0",
+        "drupal/filehash": "^3.0",
+        "drupal/flood_control": "^3.0",
+        "drupal/fpa": "^4.0",
         "drupal/fullcalendar_view": "^5.1",
         "drupal/fvm": "^2.0",
-        "drupal/geolocation": "^3.10",
-        "drupal/gtranslate": "^1.14",
-        "drupal/health_check": "^2.0",
+        "drupal/geolocation": "^3.14",
+        "drupal/gtranslate": "^3.0",
+        "drupal/health_check": "^3.1",
         "drupal/image_widget_crop": "^2.3",
-        "drupal/jquery_ui_accordion": "^1.1",
+        "drupal/jquery_ui_accordion": "^2.1",
         "drupal/keycloak": "^1.7",
-        "drupal/linkit": "^6.0@beta",
+        "drupal/linkit": "^6.1",
         "drupal/log_stdout": "^1.3",
-        "drupal/mail_login": "^2.6",
-        "drupal/media_entity_download": "^2.2",
+        "drupal/mail_login": "^4.0",
+        "drupal/media_entity_download": "^2.4",
         "drupal/media_file_delete": "^1.3",
         "drupal/media_library_edit": "^3.0",
-        "drupal/menu_breadcrumb": "^1.16",
+        "drupal/menu_breadcrumb": "^2.0@alpha",
         "drupal/menu_export": "^1.3",
-        "drupal/metatag": "^1.21",
+        "drupal/metatag": "^2.1",
         "drupal/mobile_detect": "^3.0",
-        "drupal/override_node_options": "^2.6",
+        "drupal/override_node_options": "^2.9",
         "drupal/paragraphs": "^1.14",
-        "drupal/paragraphs_edit": "^2.0",
+        "drupal/paragraphs_edit": "^3.0",
         "drupal/pathauto": "^1.10",
+        "drupal/popperjs": "^1.0",
         "drupal/published_corrected_date": "^2.0",
-        "drupal/queue_ui": "^3.1",
+        "drupal/queue_ui": "^3.2",
         "drupal/recaptcha": "^3.0",
         "drupal/redirect": "^1.8",
         "drupal/redis": "^1.6",
         "drupal/registration_link": "^2.4",
         "drupal/responsive_menu": "^4.4",
         "drupal/role_delegation": "^1.2",
-        "drupal/scheduled_publish": "^3.9",
-        "drupal/search_api": "^1.23",
+        "drupal/scheduled_publish": "^4.0",
+        "drupal/search_api": "^1.37",
         "drupal/search_api_autocomplete": "^1.9",
         "drupal/search_api_solr": "^4.3",
         "drupal/simple_block": "^1.3",
-        "drupal/simple_sitemap": "^4.1",
+        "drupal/simple_sitemap": "^4.2",
         "drupal/sitewide_alert": "^2.0",
-        "drupal/svg_image": "^1.16",
+        "drupal/svg_image": "^1.16 || ^3.1",
         "drupal/terms_of_use": "^2.3",
         "drupal/text_resize": "^1.2",
         "drupal/time_field": "^2.0",
         "drupal/twig_tweak": "^3.1",
+        "drupal/upgrade_status": "^4.3",
         "drupal/views_autosubmit": "^1.4",
-        "drupal/views_bulk_edit": "^2.8",
-        "drupal/views_bulk_operations": "~4.2.7",
+        "drupal/views_bulk_edit": "^3.0",
+        "drupal/views_bulk_operations": "^4.3",
         "drupal/views_database_connector": "^2.0",
         "drupal/views_infinite_scroll": "^2.0",
-        "drupal/viewsreference": "^1.8",
-        "drupal/webform": "^6.2 <6.2.4",
-        "drush/drush": "^11.0",
+        "drupal/viewsreference": "^2.0@beta",
+        "drupal/webform": "^6.2",
+        "drush/drush": "^12",
         "frdh/mmenu-js": "^9.2.0",
         "google/charts": "45",
         "jjj/chosen": "2.2.1",
@@ -168,7 +171,7 @@
         "webflo/drupal-finder": "^1.2"
     },
     "require-dev": {
-        "drupal/core-dev": "~9.5.0"
+        "drupal/core-dev": "^10.3.10"
     },
     "conflict": {
         "drupal/drupal": "*"
@@ -183,7 +186,11 @@
             "cweagans/composer-patches": true,
             "drupal/core-composer-scaffold": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
-            "drupal/console-extend-plugin": true
+            "drupal/console-extend-plugin": true,
+            "php-http/discovery": true,
+            "drupal/core-project-message": true,
+            "phpstan/extension-installer": true,
+            "tbachert/spi": true
         }
     },
     "autoload": {
@@ -237,26 +244,28 @@
                 "Add request to hook_redirect_response_alter": "patches/drupal/redirect/hook_alter_request.patch"
             },
             "drupal/gtranslate" : {
-               "Remove select language option and default language highlight": "patches/drupal/gtranslate/remove_select_language.patch",
-               "Select doesn't show language selected after changing pages": "patches/drupal/gtranslate/select_changed_value.patch",
-               "Block content doesn't invalidate the cache": "patches/drupal/gtranslate/block-content-cache-max-age-3316581-2.patch"
-            },
+                "Remove select language option": "patches/drupal/gtranslate/remove_select_language.patch"
+             },
             "drupal/charts": {
                 "Remember chart instances": "patches/drupal/charts/remember-charts-1.patch"
             },
             "drupal/media_library_edit": {
                 "Media library edit form mode": "patches/drupal/media_library_edit/form_mode.patch"
             },
             "drupal/core": {
-                "Media library add form mode": "patches/drupal/core/3323232-29.patch",
-                "Media library CKEditor embed": "patches/drupal/core/ckeditor-media.patch",
-                "Big Pipe handles redirects": "patches/drupal/core/big-pipe.patch"
+                "Media library add form mode": "patches/drupal/core/core-10.3-3323232.patch"
             },
             "drupal/views_infinite_scroll": {
                 "Remove repeating header": "patches/drupal/views_infinite_scroll/2899705-53.patch"
             },
             "drupal/search_api_autocomplete": {
                 "Fix DeprecationHelper": "patches/drupal/search_api_autocomplete/deprecation-helper.patch"
+            },
+            "drupal/devel": {
+                "Fix Kint": "patches/drupal/devel/devel-ksm.patch"
+            },
+            "drupal/ckeditor_media_resize" : {
+                "No HTML Filter required": "patches/drupal/ckeditor_media_resize/3401311_no_html_filter_required.patch"
             }
         }
     }