From b2fd72f620e7623483ee7f62f09c01592853d8dd Mon Sep 17 00:00:00 2001 From: CircleCI Date: Wed, 18 Jan 2023 18:47:06 +0000 Subject: [PATCH 1/4] 9.4.4 --- .../humsci_default_content/humsci_default_content.info.yml | 2 +- .../humsci_events_listeners/humsci_events_listeners.info.yml | 2 +- .../humsci/su_humsci_profile/su_humsci_profile.info.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml index cbbdcd2633..9190905d1f 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_default_content/humsci_default_content.info.yml @@ -3,7 +3,7 @@ description: 'DO NOT INSTALL. This is for profile installation task only.' core_version_requirement: '^8.8 || ^9' hidden: true type: module -version: 9.4.3 +version: 9.4.4 default_content: shortcut: - 0c69448d-c6fa-4fb8-9b2e-f93f3a955baf diff --git a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml index ec92aa38e0..71a18bc40b 100644 --- a/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/modules/humsci_events_listeners/humsci_events_listeners.info.yml @@ -14,4 +14,4 @@ dependencies: - 'hook_event_dispatcher:toolbar_event_dispatcher' - 'hook_event_dispatcher:user_event_dispatcher' - 'hook_event_dispatcher:views_event_dispatcher' -version: 9.4.3 +version: 9.4.4 diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml index 8284f1b2c7..7f9928e192 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.info.yml @@ -1,7 +1,7 @@ name: 'Stanford HumSci' type: profile description: 'Installation profile for HumSci Drupal' -version: 9.4.3 +version: 9.4.4 core_version_requirement: '^8.8 || ^9' themes: - material_admin From 62c696cc64a64e44f8fa5aff9f60ce3458bf599d Mon Sep 17 00:00:00 2001 From: Marc Berger <107938318+marcb4k@users.noreply.github.com> Date: Mon, 23 Jan 2023 07:11:16 -0800 Subject: [PATCH 2/4] SHS-134: Add Links to Codeception Docs (#1249) * docs (SHS-134): Initial test add link to test. * docs (SHS-134): Change syntax of link * docs (SHS-134): Add all other links to tests * docs (SHS-134): Fix type for one of the doc links --- docs/Codeception.md | 79 +++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/docs/Codeception.md b/docs/Codeception.md index aa9ae23155..79b4c68a4f 100644 --- a/docs/Codeception.md +++ b/docs/Codeception.md @@ -4,21 +4,21 @@ The following Codeception tests are currently run during a CI build. Unless othe ## Acceptance -* Course -* Flexible Page - * Postcard - * Accordion - * Back to top block - * Text area - * Collections (2 items per row - Text Area and Postcard) -* Private Page Field Test +* [Course](../tests/codeception/acceptance/Install/Content/CourseCest.php) +* [Flexible Page](../tests/codeception/acceptance/Install/Content/FlexiblePageCest.php) + * [Postcard](../tests/codeception/acceptance/Install/Content/FlexiblePageCest.php#L29) + * [Accordion](../tests/codeception/acceptance/Install/Content/FlexiblePageCest.php#L54) + * [Back to top block](../tests/codeception/acceptance/Install/Content/FlexiblePageCest.php#L71) + * [Text area](../tests/codeception/acceptance/Install/Content/FlexiblePageCest.php#L92) + * [Collections (2 items per row - Text Area and Postcard)](../tests/codeception/acceptance/Install/Content/FlexiblePageCest.php#L128) +* [Private Page Field Test](../tests/codeception/acceptance/Install/Content/PrivatePageContentCest.php) * With Site Manager role, test following field visibility: * Private Text Area * Private Collection * Spotlight - Slider * Accordion * Postcard -* Private Page Permissions +* [Private Page Permissions](../tests/codeception/acceptance/Install/Content/PrivatePagePermissionCest.php) * Test access to private page for role: * Site Manager * Developer @@ -31,61 +31,62 @@ The following Codeception tests are currently run during a CI build. Unless othe * Stanford Student * Authenticated user * Annoymous user -* Permissions Testing - verify the following role permssions in config match permissions in database - * Anonymous - * Authenticated user - * Contributor - * Site Manager -* Install State - * Default Content (Home page) +* [Permissions Testing - verify the following role permissions in config match permissions in database](../tests/codeception/acceptance/Install/Roles) + * [Anonymous](../tests/codeception/acceptance/Install/Roles/AnonymousCest.php) + * [Authenticated user](../tests/codeception/acceptance/Install/Roles/AuthenticatedCest.php) + * [Contributor](../tests/codeception/acceptance/Install/Roles/ContributorCest.php) + * [Site Manager](../tests/codeception/acceptance/Install/Roles/SiteManagerCest.php) +* [Install State](../tests/codeception/acceptance/Install/InstallStateCest.php) + * [Default Content (Home page)](../tests/codeception/acceptance/Install/InstallStateCest.php#L29) * Text input * Search button * Specific content - * Visible Admin Items + * [Visible Admin Items](../tests/codeception/acceptance/Install/InstallStateCest.php#L44) * Admin menu items * Specific people in user list * Specific number of shortcuts for specific roles - * Contributor - * Site Manager - * Unpublished Menu Items + * [Contributor](../tests/codeception/acceptance/Install/InstallStateCest.php#L62) + * [Site Manager](../tests/codeception/acceptance/Install/InstallStateCest.php#L73) + * [Developer](../tests/codeception/acceptance/Install/InstallStateCest.php#L84) + * [Unpublished Menu Items](../tests/codeception/acceptance/Install/InstallStateCest.php#L93) * Site Managers should be able to place a page under an unpublished page in the menu * Tests adding menu items and verifying they exist after save - * Fast 404 + * [Fast 404](../tests/codeception/acceptance/Install/InstallStateCest.php#L127) * Create a node and redirect to the node * Test visiting the redirect and verify redirect works to the node -* Paragraphs +* [Paragraphs](../tests/codeception/acceptance/Paragraphs/ParagraphsCest.php) * Tests specific paragraphs included/excluded from collections on: * Private Page * Rows * Public Collections * Flexible Page -* Menu Items - * Validity of menu links in header - * Pathauto automatic aliasing of paths +* [Menu Items](../tests/codeception/acceptance/MenuItemsCest.php) + * [Validity of menu links in header](../tests/codeception/acceptance/MenuItemsCest.php#L48) + * [Pathauto automatic aliasing of paths](../tests/codeception/acceptance/MenuItemsCest.php#L64) ## Functional -* Flexible Page - * Hero - * Photo Album - * Mobile Menu button and toggles - * Spotlight Slider (with 2 slides) - * Vertical Timeline -* Video Embed +* [Flexible Page](../tests/codeception/functional/Install/Content/FlexiblePageCest.php) + * [Hero](../tests/codeception/functional/Install/Content/FlexiblePageCest.php#L36) + * [Photo Album](../tests/codeception/functional/Install/Content/FlexiblePageCest.php#L74) + * [Mobile Menu button and toggles](../tests/codeception/functional/Install/Content/FlexiblePageCest.php#L117) + * [Spotlight Slider (with 2 slides)](../tests/codeception/functional/Install/Content/FlexiblePageCest.php#L173) + * [Vertical Timeline](../tests/codeception/functional/Install/Content/FlexiblePageCest.php#L242) +* [Video Embed](../tests/codeception/functional/Install/Content/VideoEmbedCest.php) * Title * Text field * Media (YouTube video via URL) * Caption -* Media - * Document (txt file) - * Cannot upload PHP files - * Images - * Video (YouTube via URL) -* MegaMenu +* [Media](../tests/codeception/functional/MediaCest.php) + * [Document (txt file)](../tests/codeception/functional/MediaCest.php#L14) + * [Cannot upload PHP files](../tests/codeception/functional/MediaCest.php#L30) + * [Images](../tests/codeception/functional/MediaCest.php#L41) + * [Video (YouTube via URL)](../tests/codeception/functional/MediaCest.php#L59) +* [MegaMenu](../tests/codeception/functional/MegaMenuCest.php) * Enable MegaMenu * Add top level and second level item * Toggles menu items * Mobile menu button and toggles ## Disabled Acceptance Tests - * Flexible Page - Row with Text Area + * [Flexible Page - Row with Text Area](../tests/codeception/acceptance/Install/Content/FlexiblePageCest.php#L109) From e750c8f6f43d87616998423dd1302a30e290f75e Mon Sep 17 00:00:00 2001 From: pookmish Date: Mon, 23 Jan 2023 07:12:20 -0800 Subject: [PATCH 3/4] HSD8-1421 add additional revision message for imported content --- .../migrate_plus.migration.hs_capx.yml | 16 +++-- ...te_plus.migration.hs_capx_publications.yml | 18 ++++++ .../migrate_plus.migration.hs_courses.yml | 18 ++++++ ..._plus.migration.hs_localist_individual.yml | 30 ++++++++-- ...e_plus.migration.hs_localist_scheduled.yml | 30 ++++++++-- .../Plugin/migrate/process/CurrentUser.php | 58 +++++++++++++++++++ .../su_humsci_profile.post_update.php | 18 ++++++ 7 files changed, 170 insertions(+), 18 deletions(-) create mode 100644 docroot/modules/humsci/hs_migrate/src/Plugin/migrate/process/CurrentUser.php diff --git a/config/default/migrate_plus.migration.hs_capx.yml b/config/default/migrate_plus.migration.hs_capx.yml index 5223c3748e..89e57295f1 100644 --- a/config/default/migrate_plus.migration.hs_capx.yml +++ b/config/default/migrate_plus.migration.hs_capx.yml @@ -22,6 +22,7 @@ source: square: square separator: '-' photo_params: '?placeHolderImage=false&access_token=' + update_message: 'Updated automatically' urls: { } item_selector: values fields: @@ -147,13 +148,14 @@ source: process: title: display_name revision_timestamp: - - - plugin: callback - callable: _stanford_migrate_get_time + plugin: callback + callable: _stanford_migrate_get_time revision_translation_affected: - - - plugin: default_value - default_value: 1 + plugin: default_value + default_value: 1 + revision_log: constants/update_message + revision_uid: + plugin: current_user status: constants/status type: constants/type field_hs_person_first_name: first_name @@ -409,8 +411,10 @@ destination: - image_media - image_path - image_timestamp + - revision_log - revision_timestamp - revision_translation_affected + - revision_uid - square_image_file - square_image_media - square_image_path diff --git a/config/default/migrate_plus.migration.hs_capx_publications.yml b/config/default/migrate_plus.migration.hs_capx_publications.yml index a5183fa9b9..b471deeea1 100644 --- a/config/default/migrate_plus.migration.hs_capx_publications.yml +++ b/config/default/migrate_plus.migration.hs_capx_publications.yml @@ -18,6 +18,7 @@ source: type: hs_publications minimal_html: minimal_html publication_link_title: 'Publication Link' + update_message: 'Updated automatically' urls: { } fields: - @@ -61,6 +62,15 @@ source: type: string orphan_action: forget process: + revision_timestamp: + plugin: callback + callable: _stanford_migrate_get_time + revision_translation_affected: + plugin: default_value + default_value: 1 + revision_log: constants/update_message + revision_uid: + plugin: current_user type: constants/type status: constants/status title: @@ -135,6 +145,9 @@ process: ignore_case: true values: field_hs_publication_author/target_id: '@pub_author_id' + vid: + plugin: default_value + default_value: null destination: plugin: 'entity:node' overwrite_properties: @@ -148,7 +161,12 @@ destination: - pub_author - pub_author_id - pub_author_lookup + - revision_log + - revision_timestamp + - revision_translation_affected + - revision_uid - title - type + - vid migration_dependencies: required: { } diff --git a/config/default/migrate_plus.migration.hs_courses.yml b/config/default/migrate_plus.migration.hs_courses.yml index 6241c76bdf..655303a0a5 100644 --- a/config/default/migrate_plus.migration.hs_courses.yml +++ b/config/default/migrate_plus.migration.hs_courses.yml @@ -127,7 +127,20 @@ source: type: hs_course basic_html: basic_html link: 'http://explorecourses.stanford.edu/search?q=' + update_message: 'Updated automatically' process: + revision_timestamp: + plugin: callback + callable: _stanford_migrate_get_time + revision_translation_affected: + plugin: default_value + default_value: 1 + revision_log: constants/update_message + revision_uid: + plugin: current_user + vid: + plugin: default_value + default_value: null status: constants/status type: constants/type title: title @@ -344,7 +357,12 @@ destination: - field_hs_course_subject - field_hs_course_tags - link_query + - revision_log + - revision_timestamp + - revision_translation_affected + - revision_uid - title - type + - vid migration_dependencies: required: { } diff --git a/config/default/migrate_plus.migration.hs_localist_individual.yml b/config/default/migrate_plus.migration.hs_localist_individual.yml index 4c4a42d29d..6c2c4fa483 100644 --- a/config/default/migrate_plus.migration.hs_localist_individual.yml +++ b/config/default/migrate_plus.migration.hs_localist_individual.yml @@ -26,6 +26,7 @@ source: minimal_html: minimal_html map_link_text: 'View on a map' external_link_text: 'See more about the event' + update_message: 'Updated automatically' register_text: Register image_path: 'public://events/localist/' alt: '' @@ -136,6 +137,18 @@ source: type: string orphan_action: forget process: + revision_timestamp: + plugin: callback + callable: _stanford_migrate_get_time + revision_translation_affected: + plugin: default_value + default_value: 1 + revision_log: constants/update_message + revision_uid: + plugin: current_user + vid: + plugin: default_value + default_value: null status: constants/status type: constants/type canceled: @@ -315,18 +328,13 @@ process: destination: plugin: 'entity:node' overwrite_properties: - - field_hs_event_experience - - field_hs_event_stream/uri - - field_hs_event_stream_info/value - - field_hs_event_stream_info/format - - field_hs_event_ticket/uri - - field_hs_event_ticket/title - body/format - body/value - field_hs_event_audience - field_hs_event_category - field_hs_event_date/end_value - field_hs_event_date/value + - field_hs_event_experience - field_hs_event_image/target_id - field_hs_event_link/title - field_hs_event_link/uri @@ -335,8 +343,18 @@ destination: - field_hs_event_registration/uri - field_hs_event_sponsor - field_hs_event_status + - field_hs_event_stream/uri + - field_hs_event_stream_info/format + - field_hs_event_stream_info/value + - field_hs_event_ticket/title + - field_hs_event_ticket/uri - image_file - image_name + - revision_log + - revision_timestamp + - revision_translation_affected + - revision_uid - title - type + - vid migration_dependencies: { } diff --git a/config/default/migrate_plus.migration.hs_localist_scheduled.yml b/config/default/migrate_plus.migration.hs_localist_scheduled.yml index 97ccec1bce..252ab50a91 100644 --- a/config/default/migrate_plus.migration.hs_localist_scheduled.yml +++ b/config/default/migrate_plus.migration.hs_localist_scheduled.yml @@ -26,6 +26,7 @@ source: minimal_html: minimal_html map_link_text: 'View on a map' external_link_text: 'See more about the event' + update_message: 'Updated automatically' register_text: Register image_path: 'public://events/localist/' alt: '' @@ -128,6 +129,18 @@ source: type: string orphan_action: forget process: + revision_timestamp: + plugin: callback + callable: _stanford_migrate_get_time + revision_translation_affected: + plugin: default_value + default_value: 1 + revision_log: constants/update_message + revision_uid: + plugin: current_user + vid: + plugin: default_value + default_value: null status: constants/status type: constants/type canceled: @@ -364,12 +377,6 @@ process: destination: plugin: 'entity:node' overwrite_properties: - - field_hs_event_experience - - field_hs_event_stream/uri - - field_hs_event_stream_info/value - - field_hs_event_stream_info/format - - field_hs_event_ticket/uri - - field_hs_event_ticket/title - body/format - body/value - field_hs_event_audience @@ -377,6 +384,7 @@ destination: - field_hs_event_date/duration - field_hs_event_date/end_value - field_hs_event_date/value + - field_hs_event_experience - field_hs_event_image/target_id - field_hs_event_instances - field_hs_event_link/title @@ -386,10 +394,20 @@ destination: - field_hs_event_registration/uri - field_hs_event_sponsor - field_hs_event_status + - field_hs_event_stream/uri + - field_hs_event_stream_info/format + - field_hs_event_stream_info/value + - field_hs_event_ticket/title + - field_hs_event_ticket/uri - image_file - image_name - last_end_date - last_start_date + - revision_log + - revision_timestamp + - revision_translation_affected + - revision_uid - title - type + - vid migration_dependencies: { } diff --git a/docroot/modules/humsci/hs_migrate/src/Plugin/migrate/process/CurrentUser.php b/docroot/modules/humsci/hs_migrate/src/Plugin/migrate/process/CurrentUser.php new file mode 100644 index 0000000000..16467e2841 --- /dev/null +++ b/docroot/modules/humsci/hs_migrate/src/Plugin/migrate/process/CurrentUser.php @@ -0,0 +1,58 @@ +get('current_user') + ); + } + + /** + * {@inheritdoc} + */ + public function __construct(array $configuration, $plugin_id, $plugin_definition, AccountProxyInterface $account) { + parent::__construct($configuration, $plugin_id, $plugin_definition); + $this->currentUser = $account; + } + + /** + * {@inheritdoc} + */ + public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) { + if (isset($this->configuration['return_name']) && $this->configuration['return_name']) { + return $this->currentUser->isAnonymous() ? 'Cron' : $this->currentUser->getAccountName(); + } + return $this->currentUser->id(); + } + +} diff --git a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.post_update.php b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.post_update.php index fb5a9d458b..b1b5f504bf 100644 --- a/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.post_update.php +++ b/docroot/profiles/humsci/su_humsci_profile/su_humsci_profile.post_update.php @@ -332,3 +332,21 @@ function su_humsci_profile_post_update_9205() { function su_humsci_profile_post_update_9206() { user_role_grant_permissions('site_manager', ['administer users']); } + +/** + * Set revision limits on all content types. + */ +function su_humsci_profile_post_update_9207() { + $node_types = \Drupal::entityTypeManager() + ->getStorage('node_type') + ->loadMultiple(); + /** @var \Drupal\node\NodeTypeInterface $type */ + foreach ($node_types as $type) { + if ($type->getThirdPartySetting('node_revision_delete', 'minimum_revisions_to_keep', 100) > 10) { + $type->setThirdPartySetting('node_revision_delete', 'minimum_revisions_to_keep', 10); + $type->setThirdPartySetting('node_revision_delete', 'minimum_age_to_delete', 0); + $type->setThirdPartySetting('node_revision_delete', 'when_to_delete', 0); + $type->save(); + } + } +} From 8a4730a59cd9e966697e54aa31c0f9c5338ef4d5 Mon Sep 17 00:00:00 2001 From: pookmish Date: Mon, 23 Jan 2023 11:08:29 -0800 Subject: [PATCH 4/4] Updated ui patterns patch (#1251) --- blt/src/Blt/Plugin/Commands/HsCommands.php | 26 ++- composer.json | 6 +- composer.lock | 198 +++++++++--------- .../ui_patterns-detect_libraries.patch | 36 ---- 4 files changed, 129 insertions(+), 137 deletions(-) delete mode 100644 patches/contrib/ui_patterns-detect_libraries.patch diff --git a/blt/src/Blt/Plugin/Commands/HsCommands.php b/blt/src/Blt/Plugin/Commands/HsCommands.php index cac21b7d9f..84a15eeb78 100644 --- a/blt/src/Blt/Plugin/Commands/HsCommands.php +++ b/blt/src/Blt/Plugin/Commands/HsCommands.php @@ -3,8 +3,10 @@ namespace Humsci\Blt\Plugin\Commands; use Acquia\Blt\Robo\BltTasks; +use Acquia\Blt\Robo\Common\EnvironmentDetector; use Acquia\Blt\Robo\Exceptions\BltException; use Drupal\Core\Serialization\Yaml; +use GuzzleHttp\Client; use Robo\Exception\TaskException; /** @@ -92,18 +94,38 @@ public function disableModules($modules, $environment, $excluded_sites = '') { public function cron() { // Disable alias since we are targeting specific uri. $this->config->set('drush.alias', ''); - + $failed = []; foreach ($this->getConfigValue('multisites') as $multisite) { try { $this->say("Running Cron on $multisite..."); $this->switchSiteContext($multisite); - $this->taskDrush() + $task = $this->taskDrush() ->drush("cron") ->run(); + if (!$task->wasSuccessful()) { + $failed[] = $multisite; + } } catch (\Exception $e) { $this->say("Unable to run cron on $multisite"); + continue; + } + } + + if ($failed) { + $secrets = EnvironmentDetector::getAhFilesRoot() . '/secrets.settings.php'; + if (file_exists($secrets)) { + include $secrets; + + $client = new Client(); + $payload = [ + 'username' => 'Acquia Cloud', + 'icon' => ':information_source:', + 'text' => 'Cron failed on at least one site: ' . implode(', ', $failed), + ]; + $encoded = json_encode($payload, JSON_UNESCAPED_UNICODE); + $client->post(getenv('SLACK_NOTIFICATION_URL'), ['body' => $encoded]); } } } diff --git a/composer.json b/composer.json index 877fa55732..6cdb5cc4f2 100644 --- a/composer.json +++ b/composer.json @@ -346,6 +346,9 @@ "drupal/menu_trail_by_path": { "https://www.drupal.org/project/menu_trail_by_path/issues/2914746": "https://www.drupal.org/files/issues/2022-04-06/2914746-27.patch" }, + "drupal/migrate_plus": { + "https://www.drupal.org/project/migrate_plus/issues/2837684": "https://www.drupal.org/files/issues/2023-01-13/2837684-14-migrate-plus-xml-return-as-xml.patch" + }, "drupal/paragraphs": { "https://www.drupal.org/project/paragraphs/issues/2895561": "https://www.drupal.org/files/issues/2021-05-06/paragraphs-2895561-32.patch" }, @@ -358,8 +361,7 @@ "https://www.drupal.org/project/simplesamlphp_auth/issues/2936889": "https://www.drupal.org/files/issues/2020-07-31/simplesamlphp_auth-avoid_unexpected_redirect-2936889-12-d8.patch" }, "drupal/ui_patterns": { - "Ui Patterns Views Preview": "patches/contrib/ui_patterns_views-preview.patch", - "https://www.drupal.org/project/ui_patterns/issues/3311471": "patches/contrib/ui_patterns-detect_libraries.patch" + "Ui Patterns Views Preview": "patches/contrib/ui_patterns_views-preview.patch" }, "drupal/video_embed_field": { "https://www.drupal.org/project/video_embed_field/issues/2913925": "https://www.drupal.org/files/issues/2018-07-09/retrieve-title-2913925-5.patch" diff --git a/composer.lock b/composer.lock index eb1a37e5e0..9fa08a1ccc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "662e9ac27f4bb3e6adddde64083c1177", + "content-hash": "7583f9019a3d58fccb86ed8b817ff85f", "packages": [ { "name": "acquia/blt", @@ -2971,20 +2971,20 @@ }, { "name": "drupal/block_content_permissions", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/block_content_permissions.git", - "reference": "8.x-1.10" + "reference": "8.x-1.11" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/block_content_permissions-8.x-1.10.zip", - "reference": "8.x-1.10", - "shasum": "03cfd1ff8edb05ea0f953916b23ef7b3aed82ab4" + "url": "https://ftp.drupal.org/files/projects/block_content_permissions-8.x-1.11.zip", + "reference": "8.x-1.11", + "shasum": "1ecb7330f69be30b6cf05f8682d1957c1aaf605e" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "suggest": { "drupal/block_region_permissions": "Block Region Permissions adds permissions for administering 'blocks' based on each theme's regions." @@ -2992,8 +2992,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.10", - "datestamp": "1593975004", + "version": "8.x-1.11", + "datestamp": "1674237116", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4450,16 +4450,16 @@ }, { "name": "drupal/core", - "version": "9.5.1", + "version": "9.5.2", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "083636264b027984694eb6d1e592f148ec24c637" + "reference": "2ce2d9dbc3d248d7fd6bf9c9a50cce7e8dc799a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/083636264b027984694eb6d1e592f148ec24c637", - "reference": "083636264b027984694eb6d1e592f148ec24c637", + "url": "https://api.github.com/repos/drupal/core/zipball/2ce2d9dbc3d248d7fd6bf9c9a50cce7e8dc799a6", + "reference": "2ce2d9dbc3d248d7fd6bf9c9a50cce7e8dc799a6", "shasum": "" }, "require": { @@ -4611,13 +4611,13 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.5.1" + "source": "https://github.com/drupal/core/tree/9.5.2" }, - "time": "2023-01-04T15:53:28+00:00" + "time": "2023-01-18T12:48:20+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "9.5.1", + "version": "9.5.2", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -4661,22 +4661,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.5.1" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.5.2" }, "time": "2022-06-19T16:14:18+00:00" }, { "name": "drupal/core-recommended", - "version": "9.5.1", + "version": "9.5.2", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "9004418593163c787ff9057e31cf76063dd282dc" + "reference": "eab84e96280017f11e0dfba7f9995facaa803d13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/9004418593163c787ff9057e31cf76063dd282dc", - "reference": "9004418593163c787ff9057e31cf76063dd282dc", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/eab84e96280017f11e0dfba7f9995facaa803d13", + "reference": "eab84e96280017f11e0dfba7f9995facaa803d13", "shasum": "" }, "require": { @@ -4685,7 +4685,7 @@ "doctrine/annotations": "~1.13.3", "doctrine/lexer": "~1.2.3", "doctrine/reflection": "~1.2.3", - "drupal/core": "9.5.1", + "drupal/core": "9.5.2", "egulias/email-validator": "~3.2.1", "guzzlehttp/guzzle": "~6.5.8", "guzzlehttp/promises": "~1.5.2", @@ -4747,9 +4747,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/9.5.1" + "source": "https://github.com/drupal/core-recommended/tree/9.5.2" }, - "time": "2023-01-04T15:53:28+00:00" + "time": "2023-01-18T12:48:20+00:00" }, { "name": "drupal/crop", @@ -5670,17 +5670,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.0.4", + "version": "2.0.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.0.4" + "reference": "2.0.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.4.zip", - "reference": "2.0.4", - "shasum": "6764d7b2ebb9a829c37e329156471f0efc3325e1" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.5.zip", + "reference": "2.0.5", + "shasum": "c5099a017e591eb62d52dc302a23335cca181a52" }, "require": { "drupal/core": "^9 || ^10" @@ -5688,8 +5688,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.4", - "datestamp": "1672944158", + "version": "2.0.5", + "datestamp": "1674238821", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6118,24 +6118,25 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta7", + "version": "2.0.0-beta8", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta7" + "reference": "8.x-2.0-beta8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta7.zip", - "reference": "8.x-2.0-beta7", - "shasum": "ce2a51b024082100442c0736f3c9d137af7c5b0a" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta8.zip", + "reference": "8.x-2.0-beta8", + "shasum": "02985c643f5283793e753f8cbdeaa0ec40250cf3" }, "require": { "drupal/core": "^9.1 || ^10" }, "require-dev": { "drupal/block_field": "~1.0", - "drupal/dynamic_entity_reference": "~1.0", + "drupal/ckeditor": "^1.0", + "drupal/dynamic_entity_reference": "~1.0 || ^2.0 || ^4.0", "drupal/entity_browser": "~2.0", "drupal/entity_browser_block": "~1.0", "drupal/entity_embed": "~1.0", @@ -6147,8 +6148,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta7", - "datestamp": "1662722179", + "version": "8.x-2.0-beta8", + "datestamp": "1674236921", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -6156,7 +6157,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9" + "drush.services.yml": "^9 || ^10 || ^11" } } }, @@ -6186,17 +6187,17 @@ }, { "name": "drupal/entityqueue", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entityqueue.git", - "reference": "8.x-1.5" + "reference": "8.x-1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entityqueue-8.x-1.5.zip", - "reference": "8.x-1.5", - "shasum": "7306f80ab03e82a908ccd421fe12d33804a891e0" + "url": "https://ftp.drupal.org/files/projects/entityqueue-8.x-1.6.zip", + "reference": "8.x-1.6", + "shasum": "8ae967916d48df995a959cc2725832f327379487" }, "require": { "drupal/core": "^8.7.7 || ^9 || ^10" @@ -6204,8 +6205,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.5", - "datestamp": "1672826319", + "version": "8.x-1.6", + "datestamp": "1674474067", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6238,17 +6239,17 @@ }, { "name": "drupal/environment_indicator", - "version": "4.0.12", + "version": "4.0.14", "source": { "type": "git", "url": "https://git.drupalcode.org/project/environment_indicator.git", - "reference": "4.0.12" + "reference": "4.0.14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/environment_indicator-4.0.12.zip", - "reference": "4.0.12", - "shasum": "4ccb08b69bb7cb2e093db209b7839484823bb746" + "url": "https://ftp.drupal.org/files/projects/environment_indicator-4.0.14.zip", + "reference": "4.0.14", + "shasum": "ff4fe11fcd5fa08b7ba7a451302cf93e5f68449c" }, "require": { "drupal/core": "^9.2 || ^10" @@ -6256,8 +6257,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.0.12", - "datestamp": "1671556019", + "version": "4.0.14", + "datestamp": "1674120945", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7842,17 +7843,17 @@ }, { "name": "drupal/key", - "version": "1.16.0", + "version": "1.17.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/key.git", - "reference": "8.x-1.16" + "reference": "8.x-1.17" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/key-8.x-1.16.zip", - "reference": "8.x-1.16", - "shasum": "35a4476d7d52563bb26bd4dcc5fbf5fdd7c9391b" + "url": "https://ftp.drupal.org/files/projects/key-8.x-1.17.zip", + "reference": "8.x-1.17", + "shasum": "fa9f606d2ba0e20693e12040004e2ed31302ed03" }, "require": { "drupal/core": ">=8.9 <11" @@ -7860,8 +7861,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.16", - "datestamp": "1661968490", + "version": "8.x-1.17", + "datestamp": "1674343967", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9821,26 +9822,26 @@ }, { "name": "drupal/publishcontent", - "version": "1.5.0", + "version": "1.6.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/publishcontent.git", - "reference": "8.x-1.5" + "reference": "8.x-1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/publishcontent-8.x-1.5.zip", - "reference": "8.x-1.5", - "shasum": "5a38bc2a45aad9f0e6e4979cd028bbc6f1615bb3" + "url": "https://ftp.drupal.org/files/projects/publishcontent-8.x-1.6.zip", + "reference": "8.x-1.6", + "shasum": "e0bd1fad771dcb327bea05b8daa0426f9285401e" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^8.8 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.5", - "datestamp": "1650156571", + "version": "8.x-1.6", + "datestamp": "1674143563", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -11338,17 +11339,17 @@ }, { "name": "drupal/ui_patterns", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/ui_patterns.git", - "reference": "8.x-1.4" + "reference": "8.x-1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/ui_patterns-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "ea019935f30cb3f48898426a75f1d4e544b7cbc7" + "url": "https://ftp.drupal.org/files/projects/ui_patterns-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "fbe88f3d70f50a02672cba974275a5b7703be41a" }, "require": { "drupal/core": "^9 || ^10" @@ -11360,8 +11361,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1670927845", + "version": "8.x-1.5", + "datestamp": "1674137427", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -15641,16 +15642,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.10", + "version": "v0.11.11", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "e9eadffbed9c9deb5426fd107faae0452bf20a36" + "reference": "ba67f2d26278ec9266a5cfe0acba33a8ca1277ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/e9eadffbed9c9deb5426fd107faae0452bf20a36", - "reference": "e9eadffbed9c9deb5426fd107faae0452bf20a36", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/ba67f2d26278ec9266a5cfe0acba33a8ca1277ae", + "reference": "ba67f2d26278ec9266a5cfe0acba33a8ca1277ae", "shasum": "" }, "require": { @@ -15711,9 +15712,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.10" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.11" }, - "time": "2022-12-23T17:47:18+00:00" + "time": "2023-01-23T16:14:59+00:00" }, { "name": "ralouphie/getallheaders", @@ -18010,16 +18011,16 @@ }, { "name": "su-sws/stanford_migrate", - "version": "8.4.1", + "version": "8.4.2", "source": { "type": "git", "url": "https://github.com/SU-SWS/stanford_migrate.git", - "reference": "7aa67247f099c5d01652189c4107be3e900e5d78" + "reference": "075d529d48fdbe68309b5c4450879e4b095b3aa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SU-SWS/stanford_migrate/zipball/7aa67247f099c5d01652189c4107be3e900e5d78", - "reference": "7aa67247f099c5d01652189c4107be3e900e5d78", + "url": "https://api.github.com/repos/SU-SWS/stanford_migrate/zipball/075d529d48fdbe68309b5c4450879e4b095b3aa8", + "reference": "075d529d48fdbe68309b5c4450879e4b095b3aa8", "shasum": "" }, "require": { @@ -18041,6 +18042,9 @@ "patches": { "drupal/readonly_field_widget": { "https://www.drupal.org/project/readonly_field_widget/issues/3220671": "https://www.drupal.org/files/issues/2022-08-14/third-party-settings-3220671-6.patch" + }, + "drupal/migrate_plus": { + "https://www.drupal.org/project/migrate_plus/issues/2837684": "https://www.drupal.org/files/issues/2023-01-13/2837684-14-migrate-plus-xml-return-as-xml.patch" } } }, @@ -18057,9 +18061,9 @@ "homepage": "https://github.com/SU-SWS/stanford_migrate", "support": { "issues": "https://github.com/SU-SWS/stanford_migrate/issues", - "source": "https://github.com/SU-SWS/stanford_migrate/tree/8.4.1" + "source": "https://github.com/SU-SWS/stanford_migrate/tree/8.4.2" }, - "time": "2023-01-10T15:18:39+00:00" + "time": "2023-01-23T16:26:49+00:00" }, { "name": "su-sws/stanford_ssp", @@ -23665,16 +23669,16 @@ }, { "name": "doctrine/persistence", - "version": "3.1.2", + "version": "3.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "b44d128311af55275dbed6a4558ca59a2b9f9387" + "reference": "920da294b4bb0bb527f2a91ed60c18213435880f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/b44d128311af55275dbed6a4558ca59a2b9f9387", - "reference": "b44d128311af55275dbed6a4558ca59a2b9f9387", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/920da294b4bb0bb527f2a91ed60c18213435880f", + "reference": "920da294b4bb0bb527f2a91ed60c18213435880f", "shasum": "" }, "require": { @@ -23743,7 +23747,7 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/3.1.2" + "source": "https://github.com/doctrine/persistence/tree/3.1.3" }, "funding": [ { @@ -23759,7 +23763,7 @@ "type": "tidelift" } ], - "time": "2022-12-19T13:58:18+00:00" + "time": "2023-01-19T13:39:42+00:00" }, { "name": "drupal/config_inspector", @@ -24116,7 +24120,7 @@ }, { "name": "drupal/core-dev", - "version": "9.5.1", + "version": "9.5.2", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", @@ -24160,7 +24164,7 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/9.5.1" + "source": "https://github.com/drupal/core-dev/tree/9.5.2" }, "time": "2022-07-27T00:23:55+00:00" }, @@ -27625,5 +27629,5 @@ "php": ">=8.0" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/patches/contrib/ui_patterns-detect_libraries.patch b/patches/contrib/ui_patterns-detect_libraries.patch deleted file mode 100644 index 62d82dba23..0000000000 --- a/patches/contrib/ui_patterns-detect_libraries.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/modules/ui_patterns_library/src/Plugin/Deriver/LibraryDeriver.php b/modules/ui_patterns_library/src/Plugin/Deriver/LibraryDeriver.php -index a0da46e..fc9fb35 100644 ---- a/modules/ui_patterns_library/src/Plugin/Deriver/LibraryDeriver.php -+++ b/modules/ui_patterns_library/src/Plugin/Deriver/LibraryDeriver.php -@@ -154,27 +154,14 @@ class LibraryDeriver extends AbstractYamlPatternsDeriver { - /** - * Create a list of all directories to scan. - * -- * This includes all module directories and directories of the default theme -- * and all of its possible base themes. -+ * This includes all module and theme directories. - * - * @return array - * An array containing directory paths keyed by their extension name. - */ -- protected function getDirectories() { -- $default_theme = $this->themeHandler->getDefault(); -- $base_themes = $this->themeHandler->getBaseThemes($this->themeHandler->listInfo(), $default_theme); -- $theme_directories = $this->themeHandler->getThemeDirectories(); -- -- $directories = []; -- if (isset($theme_directories[$default_theme])) { -- $directories[$default_theme] = $theme_directories[$default_theme]; -- foreach (array_keys($base_themes) as $name) { -- $directories[$name] = $theme_directories[$name]; -- } -- } -- -- return $directories + $this->moduleHandler->getModuleDirectories(); -- } -+ protected function getDirectories() { -+ return $this->moduleHandler->getModuleDirectories() + $this->themeHandler->getThemeDirectories(); -+ } - - /** - * Get extension name that hosts the given YAML definition file.