From e03d0437795fb0e8d482fd95248c0e93989d241c Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Mon, 9 May 2022 14:51:50 -0700 Subject: [PATCH 1/3] back to dev --- composer.json | 12 ++++++------ .../stanford_basic_page_types.info.yml | 2 +- modules/stanford_intranet/stanford_intranet.info.yml | 2 +- .../stanford_paragraph_card.info.yml | 2 +- .../stanford_profile_drush.info.yml | 2 +- .../stanford_profile_styles.info.yml | 2 +- stanford_profile_helper.info.yml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 26033e64..40b44084 100644 --- a/composer.json +++ b/composer.json @@ -86,12 +86,12 @@ "drupal/ui_patterns": "~1.0", "drupal/views_custom_cache_tag": "^1.2", "drupal/xmlsitemap": "~1.0", - "su-sws/jumpstart_ui": "^8.1", - "su-sws/react_paragraphs": "^8.2", - "su-sws/stanford_date_formats": "^8.1", - "su-sws/stanford_fields": "^8.1", - "su-sws/stanford_image_styles": "^8.1", - "su-sws/stanford_text_editor": "^8.1" + "su-sws/jumpstart_ui": "8.x-dev", + "su-sws/react_paragraphs": "8.x-dev", + "su-sws/stanford_date_formats": "8.x-dev", + "su-sws/stanford_fields": "8.x-dev", + "su-sws/stanford_image_styles": "8.x-dev", + "su-sws/stanford_text_editor": "8.x-dev" }, "require-dev": { "drupal/externalauth": "^1.0 || ^2.0" diff --git a/modules/stanford_basic_page_types/stanford_basic_page_types.info.yml b/modules/stanford_basic_page_types/stanford_basic_page_types.info.yml index 5dbc5b84..fe83c030 100644 --- a/modules/stanford_basic_page_types/stanford_basic_page_types.info.yml +++ b/modules/stanford_basic_page_types/stanford_basic_page_types.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Basic Page Types' description: 'Provides support for basic page types in stanford_page nodes' -version: 8.x-2.1 +version: 8.x-2.2-dev core_version_requirement: '^8.8 || ^9' type: module project: Stanford diff --git a/modules/stanford_intranet/stanford_intranet.info.yml b/modules/stanford_intranet/stanford_intranet.info.yml index 0ebad2dd..afd5eadc 100644 --- a/modules/stanford_intranet/stanford_intranet.info.yml +++ b/modules/stanford_intranet/stanford_intranet.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Intranet' description: 'Locks down access to the entire site if configured.' -version: 8.x-2.1 +version: 8.x-2.2-dev core_version_requirement: '^8.8 || ^9' type: module project: Stanford diff --git a/modules/stanford_paragraph_card/stanford_paragraph_card.info.yml b/modules/stanford_paragraph_card/stanford_paragraph_card.info.yml index dae2e93a..0d11efdb 100644 --- a/modules/stanford_paragraph_card/stanford_paragraph_card.info.yml +++ b/modules/stanford_paragraph_card/stanford_paragraph_card.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Paragraph Card' description: 'Adds helpers and modifications to the card paragraph type.' -version: 8.x-2.1 +version: 8.x-2.2-dev core_version_requirement: '^8 || ^9' type: module project: Stanford diff --git a/modules/stanford_profile_drush/stanford_profile_drush.info.yml b/modules/stanford_profile_drush/stanford_profile_drush.info.yml index 8cdb23d9..cb5a78d9 100644 --- a/modules/stanford_profile_drush/stanford_profile_drush.info.yml +++ b/modules/stanford_profile_drush/stanford_profile_drush.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Profile Drush' description: 'A collection of Drush commands since commands in the profile are not discoverable.' -version: 8.x-2.1 +version: 8.x-2.2-dev core_version_requirement: '^8 || ^9' type: module project: Stanford diff --git a/modules/stanford_profile_styles/stanford_profile_styles.info.yml b/modules/stanford_profile_styles/stanford_profile_styles.info.yml index d5ef8b91..aefbc651 100644 --- a/modules/stanford_profile_styles/stanford_profile_styles.info.yml +++ b/modules/stanford_profile_styles/stanford_profile_styles.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Profile Styles' description: 'A module for theming' -version: 8.x-2.1 +version: 8.x-2.2-dev core_version_requirement: '^8 || ^9' type: module project: Stanford diff --git a/stanford_profile_helper.info.yml b/stanford_profile_helper.info.yml index 9b855524..a358ad78 100644 --- a/stanford_profile_helper.info.yml +++ b/stanford_profile_helper.info.yml @@ -3,7 +3,7 @@ type: module description: 'Stanford Profile Helper Module.' core_version_requirement: ^8.8 || ^9 package: Stanford -version: 8.x-2.1 +version: 8.x-2.2-dev dependencies: - 'admin_toolbar:admin_toolbar' - 'admin_toolbar:admin_toolbar_tools' From 7d452f1181eafaafdc584671338d276ef6c86ff2 Mon Sep 17 00:00:00 2001 From: Joe Gilliland-Lloyd <6943710+joegl@users.noreply.github.com> Date: Tue, 10 May 2022 15:56:18 -0500 Subject: [PATCH 2/3] Added conditional to fix null fatal error on 8102 update. (#205) Co-authored-by: joegl --- stanford_profile_helper.post_update.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/stanford_profile_helper.post_update.php b/stanford_profile_helper.post_update.php index d462048e..5e76e1c5 100644 --- a/stanford_profile_helper.post_update.php +++ b/stanford_profile_helper.post_update.php @@ -146,7 +146,10 @@ function stanford_profile_helper_post_update_8102() { foreach ($configs as $data) { /** @var \Drupal\pathauto\PathautoPatternInterface $pathauto_pattern */ $pathauto_pattern = $pathauto_storage->load($data['id']); - if ($pathauto_pattern->getPattern() != $data['pattern']) { + if ( + $pathauto_pattern && + $pathauto_pattern->getPattern() != $data['pattern'] + ) { $pathauto_pattern->setPattern($data['pattern'])->save(); } } From ebfed129bbbb33a2a7a15223222d6cdb273c3743 Mon Sep 17 00:00:00 2001 From: Mike Decker Date: Tue, 10 May 2022 13:58:49 -0700 Subject: [PATCH 3/3] 8.2.2 --- CHANGELOG.md | 7 +++++++ composer.json | 12 ++++++------ .../stanford_basic_page_types.info.yml | 2 +- modules/stanford_intranet/stanford_intranet.info.yml | 2 +- .../stanford_paragraph_card.info.yml | 2 +- .../stanford_profile_drush.info.yml | 2 +- .../stanford_profile_styles.info.yml | 2 +- stanford_profile_helper.info.yml | 2 +- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d40bfc0..87fbaa3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Stanford Profile Helper + +8.x-2.2 +-------------------------------------------------------------------------------- +_Release Date: 2022-05-10_ + +- Added conditional to fix null fatal error on 8102 update. (#205) + 8.x-2.1 -------------------------------------------------------------------------------- _Release Date: 2022-05-09_ diff --git a/composer.json b/composer.json index 40b44084..26033e64 100644 --- a/composer.json +++ b/composer.json @@ -86,12 +86,12 @@ "drupal/ui_patterns": "~1.0", "drupal/views_custom_cache_tag": "^1.2", "drupal/xmlsitemap": "~1.0", - "su-sws/jumpstart_ui": "8.x-dev", - "su-sws/react_paragraphs": "8.x-dev", - "su-sws/stanford_date_formats": "8.x-dev", - "su-sws/stanford_fields": "8.x-dev", - "su-sws/stanford_image_styles": "8.x-dev", - "su-sws/stanford_text_editor": "8.x-dev" + "su-sws/jumpstart_ui": "^8.1", + "su-sws/react_paragraphs": "^8.2", + "su-sws/stanford_date_formats": "^8.1", + "su-sws/stanford_fields": "^8.1", + "su-sws/stanford_image_styles": "^8.1", + "su-sws/stanford_text_editor": "^8.1" }, "require-dev": { "drupal/externalauth": "^1.0 || ^2.0" diff --git a/modules/stanford_basic_page_types/stanford_basic_page_types.info.yml b/modules/stanford_basic_page_types/stanford_basic_page_types.info.yml index fe83c030..c8b10464 100644 --- a/modules/stanford_basic_page_types/stanford_basic_page_types.info.yml +++ b/modules/stanford_basic_page_types/stanford_basic_page_types.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Basic Page Types' description: 'Provides support for basic page types in stanford_page nodes' -version: 8.x-2.2-dev +version: 8.x-2.2 core_version_requirement: '^8.8 || ^9' type: module project: Stanford diff --git a/modules/stanford_intranet/stanford_intranet.info.yml b/modules/stanford_intranet/stanford_intranet.info.yml index afd5eadc..d5b8c8ce 100644 --- a/modules/stanford_intranet/stanford_intranet.info.yml +++ b/modules/stanford_intranet/stanford_intranet.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Intranet' description: 'Locks down access to the entire site if configured.' -version: 8.x-2.2-dev +version: 8.x-2.2 core_version_requirement: '^8.8 || ^9' type: module project: Stanford diff --git a/modules/stanford_paragraph_card/stanford_paragraph_card.info.yml b/modules/stanford_paragraph_card/stanford_paragraph_card.info.yml index 0d11efdb..39a98326 100644 --- a/modules/stanford_paragraph_card/stanford_paragraph_card.info.yml +++ b/modules/stanford_paragraph_card/stanford_paragraph_card.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Paragraph Card' description: 'Adds helpers and modifications to the card paragraph type.' -version: 8.x-2.2-dev +version: 8.x-2.2 core_version_requirement: '^8 || ^9' type: module project: Stanford diff --git a/modules/stanford_profile_drush/stanford_profile_drush.info.yml b/modules/stanford_profile_drush/stanford_profile_drush.info.yml index cb5a78d9..2faad9a7 100644 --- a/modules/stanford_profile_drush/stanford_profile_drush.info.yml +++ b/modules/stanford_profile_drush/stanford_profile_drush.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Profile Drush' description: 'A collection of Drush commands since commands in the profile are not discoverable.' -version: 8.x-2.2-dev +version: 8.x-2.2 core_version_requirement: '^8 || ^9' type: module project: Stanford diff --git a/modules/stanford_profile_styles/stanford_profile_styles.info.yml b/modules/stanford_profile_styles/stanford_profile_styles.info.yml index aefbc651..181d02c1 100644 --- a/modules/stanford_profile_styles/stanford_profile_styles.info.yml +++ b/modules/stanford_profile_styles/stanford_profile_styles.info.yml @@ -1,6 +1,6 @@ name: 'Stanford Profile Styles' description: 'A module for theming' -version: 8.x-2.2-dev +version: 8.x-2.2 core_version_requirement: '^8 || ^9' type: module project: Stanford diff --git a/stanford_profile_helper.info.yml b/stanford_profile_helper.info.yml index a358ad78..6d18f63f 100644 --- a/stanford_profile_helper.info.yml +++ b/stanford_profile_helper.info.yml @@ -3,7 +3,7 @@ type: module description: 'Stanford Profile Helper Module.' core_version_requirement: ^8.8 || ^9 package: Stanford -version: 8.x-2.2-dev +version: 8.x-2.2 dependencies: - 'admin_toolbar:admin_toolbar' - 'admin_toolbar:admin_toolbar_tools'