From 243e9bcb29a859fc66dc4bf3ef2b6a5996be5658 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Wed, 27 Nov 2024 16:11:24 -0800 Subject: [PATCH 01/18] fix(SHS-5958): Fix issue with paragraphs features to allow add buttons on non gin/claro themes --- composer.json | 3 +++ composer.lock | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 576be2ab9..5dbcaf158 100644 --- a/composer.json +++ b/composer.json @@ -286,6 +286,9 @@ "https://www.drupal.org/project/paragraphs_browser/issues/3381981": "https://www.drupal.org/files/issues/2023-08-22/3381981-sort-by-weight-4.patch", "https://www.drupal.org/project/paragraphs_browser/issues/3064852": "https://www.drupal.org/files/issues/2023-11-07/3064852-allow-hiding-browser-12.patch" }, + "drupal/paragraphs_features": { + "Add-in only works if active theme is claro or gin https://www.drupal.org/project/paragraphs_features/issues/3353704": "https://www.drupal.org/files/issues/2024-03-22/3353704-mr12-18.patch" + }, "drupal/redirect": { "https://www.drupal.org/project/redirect/issues/3057250": "https://www.drupal.org/files/issues/2024-08-11/redirect--2024-08-11--3057250-79.patch", "https://www.drupal.org/project/redirect/issues/3018897": "https://www.drupal.org/files/issues/2024-08-12/redirect-3018897-28.patch" diff --git a/composer.lock b/composer.lock index 03e9839b3..a13798352 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": "2f7bad9bdb9e627d50c258def1e34095", + "content-hash": "12116928b7d46ae4cd56e54fcc0deb3c", "packages": [ { "name": "acquia/blt", From dd4192c3c422c216725c54efe20526b64c3db69f Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Tue, 3 Dec 2024 11:33:28 -0800 Subject: [PATCH 02/18] feat(SHS-5958): Add config and update hook to allow add paragraphs in between --- ...orm_display.node.hs_basic_page.default.yml | 24 ++++++++++---- ...m_display.node.hs_private_page.default.yml | 18 ++++++++--- .../hs_paragraph_types.install | 32 +++++++++++++++++++ 3 files changed, 64 insertions(+), 10 deletions(-) diff --git a/config/default/core.entity_form_display.node.hs_basic_page.default.yml b/config/default/core.entity_form_display.node.hs_basic_page.default.yml index 632a01427..dc226a8ff 100644 --- a/config/default/core.entity_form_display.node.hs_basic_page.default.yml +++ b/config/default/core.entity_form_display.node.hs_basic_page.default.yml @@ -9,6 +9,7 @@ dependencies: - field.field.node.hs_basic_page.layout_builder__layout - node.type.hs_basic_page module: + - field_formatter_class - menu_link - paragraphs - paragraphs_ee @@ -48,9 +49,11 @@ content: duplicate: duplicate expose_drag_drop: '1' third_party_settings: + field_formatter_class: + class: '' paragraphs_features: - add_in_between: false - add_in_between_link_count: 3 + add_in_between: true + add_in_between_link_count: 0 delete_confirmation: false show_drag_and_drop: true show_collapse_all: true @@ -58,6 +61,7 @@ content: paragraphs_ee: dialog_off_canvas: false dialog_style: tiles + drag_drop: false field_hs_page_hero: type: paragraphs weight: 1 @@ -79,9 +83,11 @@ content: duplicate: duplicate expose_drag_drop: '1' third_party_settings: + field_formatter_class: + class: '' paragraphs_features: - add_in_between: false - add_in_between_link_count: 3 + add_in_between: true + add_in_between_link_count: 0 delete_confirmation: false show_drag_and_drop: true show_collapse_all: true @@ -89,12 +95,19 @@ content: paragraphs_ee: dialog_off_canvas: false dialog_style: tiles + drag_drop: false field_menulink: type: menu_link_default weight: 26 region: content settings: { } third_party_settings: { } + layout_builder__layout: + type: null + weight: 30 + region: content + settings: { } + third_party_settings: { } path: type: path weight: 7 @@ -145,5 +158,4 @@ content: region: content settings: { } third_party_settings: { } -hidden: - layout_builder__layout: true +hidden: { } diff --git a/config/default/core.entity_form_display.node.hs_private_page.default.yml b/config/default/core.entity_form_display.node.hs_private_page.default.yml index 49d3d1b8c..44077d5e7 100644 --- a/config/default/core.entity_form_display.node.hs_private_page.default.yml +++ b/config/default/core.entity_form_display.node.hs_private_page.default.yml @@ -9,6 +9,7 @@ dependencies: - field.field.node.hs_private_page.layout_builder__layout - node.type.hs_private_page module: + - field_formatter_class - file - insert - menu_link @@ -46,10 +47,13 @@ content: collapse_edit_all: collapse_edit_all convert: '0' duplicate: duplicate + expose_drag_drop: '1' third_party_settings: + field_formatter_class: + class: '' paragraphs_features: - add_in_between: false - add_in_between_link_count: 3 + add_in_between: true + add_in_between_link_count: 0 delete_confirmation: false show_drag_and_drop: true show_collapse_all: true @@ -57,6 +61,7 @@ content: paragraphs_ee: dialog_off_canvas: false dialog_style: tiles + drag_drop: false field_menulink: type: menu_link_default weight: 26 @@ -78,6 +83,12 @@ content: audio: 0 video: 0 default: link + layout_builder__layout: + type: null + weight: 27 + region: content + settings: { } + third_party_settings: { } path: type: path weight: 5 @@ -128,5 +139,4 @@ content: region: content settings: { } third_party_settings: { } -hidden: - layout_builder__layout: true +hidden: { } diff --git a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install index 012655950..c26c5f223 100644 --- a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install +++ b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install @@ -376,3 +376,35 @@ function hs_paragraph_types_update_10010() { $hs_priv_collection_style->delete(); } } + +/** + * Adds add between buttons to existing paragraphs. + */ +function hs_paragraph_types_update_10011() { + $config_to_update = [ + 'core.entity_form_display.node.hs_basic_page.default', + 'core.entity_form_display.node.hs_private_page.default', + ]; + // Load the configuration from the config/sync directory. + $config_directory = \Drupal::service('config.storage.sync'); + + foreach ($config_to_update as $config) { + $config_data = $config_directory->read($config); + + // Check if the form display configuration already exists. + $entity_type_manager = \Drupal::entityTypeManager(); + /** @var ConfigEntityStorageInterface $config_storage */ + $config_storage = $entity_type_manager->getStorage('entity_form_display'); + $existing_config = $config_storage->load($config_data['id']); + + if ($existing_config) { + $existing_config = $config_storage + ->updateFromStorageRecord($existing_config, $config_data); + $existing_config->save(); + } + else { + // If it doesn't exist, create and save it. + $config_storage->create($config_data)->save(); + } + } +} From 3ed4c8e63cdbd30c354abc90b0b79b3e6c6191ae Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Wed, 4 Dec 2024 11:10:17 -0800 Subject: [PATCH 03/18] refactor(SHS-5958): Change how we are updating the add in between to config --- .../hs_paragraph_types.install | 39 +++++++++---------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install index c26c5f223..8c8f808c1 100644 --- a/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install +++ b/docroot/modules/humsci/hs_paragraph_types/hs_paragraph_types.install @@ -381,30 +381,27 @@ function hs_paragraph_types_update_10010() { * Adds add between buttons to existing paragraphs. */ function hs_paragraph_types_update_10011() { - $config_to_update = [ - 'core.entity_form_display.node.hs_basic_page.default', - 'core.entity_form_display.node.hs_private_page.default', + $fields = [ + 'field_hs_page_components' => 'node.hs_basic_page.default', + 'field_hs_page_hero' => 'node.hs_basic_page.default', + 'field_hs_priv_page_components' => 'node.hs_private_page.default', ]; - // Load the configuration from the config/sync directory. - $config_directory = \Drupal::service('config.storage.sync'); - - foreach ($config_to_update as $config) { - $config_data = $config_directory->read($config); + $form_display_storage = \Drupal::entityTypeManager()->getStorage('entity_form_display'); + foreach ($fields as $field => $form_display_id) { + /** @var \Drupal\Core\Entity\Display\EntityFormDisplayInterface $form_display */ + $form_display = $form_display_storage->load($form_display_id); + if (empty($form_display)) { + continue; + } - // Check if the form display configuration already exists. - $entity_type_manager = \Drupal::entityTypeManager(); - /** @var ConfigEntityStorageInterface $config_storage */ - $config_storage = $entity_type_manager->getStorage('entity_form_display'); - $existing_config = $config_storage->load($config_data['id']); + $component = $form_display->getComponent($field); - if ($existing_config) { - $existing_config = $config_storage - ->updateFromStorageRecord($existing_config, $config_data); - $existing_config->save(); - } - else { - // If it doesn't exist, create and save it. - $config_storage->create($config_data)->save(); + if (empty($component)) { + continue; } + $component['third_party_settings']['paragraphs_features']['add_in_between'] = 'true'; + $component['third_party_settings']['paragraphs_features']['add_in_between_link_count'] = 0; + $form_display->setComponent($field, $component) + ->save(); } } From 338c3ca11931bfe79bd8f06fe8a35d784a6e58e2 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Wed, 4 Dec 2024 12:05:42 -0800 Subject: [PATCH 04/18] test(SHS-5958): Update test to refelect new buttons --- .../codeception/functional/Install/Content/FlexiblePageCest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/codeception/functional/Install/Content/FlexiblePageCest.php b/tests/codeception/functional/Install/Content/FlexiblePageCest.php index 559d78700..f6d6e39b5 100644 --- a/tests/codeception/functional/Install/Content/FlexiblePageCest.php +++ b/tests/codeception/functional/Install/Content/FlexiblePageCest.php @@ -91,7 +91,7 @@ public function testHeroParagraph(FunctionalTester $I) { // Prevent JS alerts from firing before loading a new page. $I->executeJS('window.onbeforeunload = undefined;'); $I->fillField('Title', 'Demo Basic Page'); - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Banner'); $I->click('Banner image with full overlay and text', '.paragraphs-ee-add-dialog'); From 3ed393a234963371b3661fde09739a7683459349 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Wed, 4 Dec 2024 12:17:18 -0800 Subject: [PATCH 05/18] test(SHS-5958): Update testPostCard test for new add in between buttons --- .../codeception/functional/Install/Content/FlexiblePageCest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/codeception/functional/Install/Content/FlexiblePageCest.php b/tests/codeception/functional/Install/Content/FlexiblePageCest.php index f6d6e39b5..544c162f5 100644 --- a/tests/codeception/functional/Install/Content/FlexiblePageCest.php +++ b/tests/codeception/functional/Install/Content/FlexiblePageCest.php @@ -352,7 +352,7 @@ public function testPostCard(FunctionalTester $I) { $I->logInWithRole('contributor'); $I->amOnPage('/node/add/hs_basic_page'); $I->fillField('Title', 'Demo Basic Page'); - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Postcard'); $I->click('Postcard', '.paragraphs-ee-add-dialog'); From 0040930f6b7d39fae2bc4b909757ae29dcb6162e Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Wed, 4 Dec 2024 12:41:48 -0800 Subject: [PATCH 06/18] test(SHS-5958): Update other tests for new add in between buttons --- .../Install/Content/FlexiblePageCest.php | 18 +++++++++--------- .../Install/Content/PrivatePageContentCest.php | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/codeception/functional/Install/Content/FlexiblePageCest.php b/tests/codeception/functional/Install/Content/FlexiblePageCest.php index 544c162f5..54b8fe625 100644 --- a/tests/codeception/functional/Install/Content/FlexiblePageCest.php +++ b/tests/codeception/functional/Install/Content/FlexiblePageCest.php @@ -61,8 +61,8 @@ public function testDuplicateScroll(FunctionalTester $I) { 'type' => 'hs_basic_page', ]); $I->amOnPage($node->toUrl('edit-form')->toString()); - $I->scrollTo('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->scrollTo('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Collection'); $I->click('Collection', '.paragraphs-ee-add-dialog'); @@ -132,7 +132,7 @@ public function testPhotoAlbum(FunctionalTester $I) { // Prevent JS alerts from firing before loading a new page. $I->executeJS('window.onbeforeunload = undefined;'); $I->fillField('Title', 'Demo Basic Page'); - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Photo Album'); $I->click('Photo Album', '.paragraphs-ee-add-dialog'); @@ -236,7 +236,7 @@ public function testSpotlightSlider(FunctionalTester $I) { 'type' => 'hs_basic_page', ]); $I->amOnPage($node->toUrl('edit-form')->toString()); - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Spotlight'); $I->click('Spotlight(s)', '.paragraphs-ee-add-dialog'); @@ -308,7 +308,7 @@ public function testVerticalTimeline(FunctionalTester $I) { $I->logInWithRole('administrator'); $I->amOnPage('node/add/hs_basic_page'); $I->fillField('Title', $this->faker->words(3, TRUE)); - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Vertical Timeline'); $I->click('Vertical Timeline', '.paragraphs-ee-add-dialog'); @@ -376,7 +376,7 @@ public function testAccordion(FunctionalTester $I) { $I->logInWithRole('contributor'); $I->amOnPage('/node/add/hs_basic_page'); $I->fillField('Title', 'Demo Basic Page'); - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'accordion'); $I->click('Accordion', '.paragraphs-ee-add-dialog'); @@ -405,7 +405,7 @@ public function testBackToTopExists(FunctionalTester $I) { } catch (\Exception $e) { // Add component if does not already exist. - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'text area'); $I->click('Text Area', '.paragraphs-ee-add-dialog'); @@ -446,7 +446,7 @@ public function testTextArea(FunctionalTester $I) { } catch (\Exception $e) { // Add component if does not already exist. - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'text area'); $I->click('Text Area', '.paragraphs-ee-add-dialog'); @@ -477,7 +477,7 @@ public function testCollections(FunctionalTester $I) { $I->amOnPage('/node/add/hs_basic_page'); $I->fillField('Title', 'Demo Basic Page'); // Add a Collection component to the page. - $I->click('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Collection'); $I->click('Collection', '.paragraphs-ee-add-dialog'); diff --git a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php index 5714ad1af..02423cd02 100644 --- a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php +++ b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php @@ -68,7 +68,7 @@ public function testPrivatePageContent(FunctionalTester $I) { $I->fillField('Title', 'Test Private Page'); foreach ($this->fieldsToCheck as $component => $component_info) { $I->scrollTo('.field--name-field-priv-wysiwyg-files'); - $I->click('Add Component'); + $I->click('#field-hs-priv-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', $component); $I->click($component_info['component_button_name'], '.paragraphs-ee-add-dialog'); From 0c1e3ea13353acf8323a30375fba6e5626a99f94 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Wed, 4 Dec 2024 13:20:49 -0800 Subject: [PATCH 07/18] test(SHS-5958): Add a wait in test to make sure JS add in between buttons load --- .../functional/Install/Content/PrivatePageContentCest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php index 02423cd02..9d81dafdc 100644 --- a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php +++ b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php @@ -68,6 +68,7 @@ public function testPrivatePageContent(FunctionalTester $I) { $I->fillField('Title', 'Test Private Page'); foreach ($this->fieldsToCheck as $component => $component_info) { $I->scrollTo('.field--name-field-priv-wysiwyg-files'); + $I->wait(3); $I->click('#field-hs-priv-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', $component); From 20bc3a147180eceb7158e27a83d237cb4ff36233 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Wed, 4 Dec 2024 13:47:34 -0800 Subject: [PATCH 08/18] test(SHS-5958): Fix photo album test - photo album can come before or after text component, making tests work sometimes but not all the time --- .../codeception/functional/Install/Content/FlexiblePageCest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/codeception/functional/Install/Content/FlexiblePageCest.php b/tests/codeception/functional/Install/Content/FlexiblePageCest.php index 54b8fe625..7d182b37d 100644 --- a/tests/codeception/functional/Install/Content/FlexiblePageCest.php +++ b/tests/codeception/functional/Install/Content/FlexiblePageCest.php @@ -158,7 +158,7 @@ public function testPhotoAlbum(FunctionalTester $I) { $I->canSeeNumberOfElements('#cboxContent img', 0); $I->waitForText('Edit'); $I->click('Edit', '.tabs'); - $I->click('field_hs_page_components_1_edit'); + $I->click('//input[@data-paragraphs-split-text-type="stanford_gallery"]/preceding::input[contains(@class, "paragraphs-icon-button-edit")][1]'); $I->waitForText('Content'); $I->scrollTo('Style'); $I->selectOption('Style', 'Slideshow'); From 56e40a52e491da1d0cf33a66c9d42aa9259d6cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Wed, 4 Dec 2024 19:49:09 -0600 Subject: [PATCH 09/18] fix(shs-5958): fix video embed test --- tests/codeception/functional/Install/Content/VideoEmbedCest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/codeception/functional/Install/Content/VideoEmbedCest.php b/tests/codeception/functional/Install/Content/VideoEmbedCest.php index 0db1a26a5..af791ecc6 100644 --- a/tests/codeception/functional/Install/Content/VideoEmbedCest.php +++ b/tests/codeception/functional/Install/Content/VideoEmbedCest.php @@ -33,7 +33,7 @@ public function testVideoEmbed(FunctionalTester $I) { $I->fillField('Title', $this->faker->words(3, TRUE)); // Add text field. - $I->scrollTo('#edit-field-hs-page-components-add-more-add-modal-form-area-add-more'); + $I->scrollTo('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->click('Add Component'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Text Area'); From bc124207f637ac5ebdd6756f43dd3b0c9aa98b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Wed, 4 Dec 2024 20:07:35 -0600 Subject: [PATCH 10/18] fix(shs-5958): fix private page tests --- .../functional/Install/Content/PrivatePageContentCest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php index 9d81dafdc..2ce3c2fe6 100644 --- a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php +++ b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php @@ -67,8 +67,6 @@ public function testPrivatePageContent(FunctionalTester $I) { $I->amOnPage('/node/add/hs_private_page'); $I->fillField('Title', 'Test Private Page'); foreach ($this->fieldsToCheck as $component => $component_info) { - $I->scrollTo('.field--name-field-priv-wysiwyg-files'); - $I->wait(3); $I->click('#field-hs-priv-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', $component); From e57db70f1da16e0d12a084f0f2bb4271bd7e786b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Wed, 4 Dec 2024 20:30:57 -0600 Subject: [PATCH 11/18] fix(shs-5958): fix video embed test --- .../codeception/functional/Install/Content/VideoEmbedCest.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/codeception/functional/Install/Content/VideoEmbedCest.php b/tests/codeception/functional/Install/Content/VideoEmbedCest.php index af791ecc6..f9573d3d9 100644 --- a/tests/codeception/functional/Install/Content/VideoEmbedCest.php +++ b/tests/codeception/functional/Install/Content/VideoEmbedCest.php @@ -33,8 +33,7 @@ public function testVideoEmbed(FunctionalTester $I) { $I->fillField('Title', $this->faker->words(3, TRUE)); // Add text field. - $I->scrollTo('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); - $I->click('Add Component'); + $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Text Area'); $I->click('Text Area', '.paragraphs-ee-add-dialog'); From 3cc1e1558868475a09789d360009c1188ceeb2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Wed, 4 Dec 2024 20:54:30 -0600 Subject: [PATCH 12/18] fix(shs-5958): fix private page tests --- .../functional/Install/Content/PrivatePageContentCest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php index 2ce3c2fe6..f8a3d3534 100644 --- a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php +++ b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php @@ -67,7 +67,8 @@ public function testPrivatePageContent(FunctionalTester $I) { $I->amOnPage('/node/add/hs_private_page'); $I->fillField('Title', 'Test Private Page'); foreach ($this->fieldsToCheck as $component => $component_info) { - $I->click('#field-hs-priv-page-components-values .paragraphs-features__add-in-between__button'); + $I->scrollTo('.field--name-field-priv-wysiwyg-files'); + $I->click('+ Add'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', $component); $I->click($component_info['component_button_name'], '.paragraphs-ee-add-dialog'); From e7d1407b64a3670d1a30591a5601b79a1e5e90fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Thu, 5 Dec 2024 12:26:10 -0600 Subject: [PATCH 13/18] fix(shs-5958): fixes in tests --- .../Install/Content/FlexiblePageCest.php | 22 +++++++++---------- .../Content/PrivatePageContentCest.php | 4 ++-- .../Install/Content/VideoEmbedCest.php | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/codeception/functional/Install/Content/FlexiblePageCest.php b/tests/codeception/functional/Install/Content/FlexiblePageCest.php index 7d182b37d..26804fb83 100644 --- a/tests/codeception/functional/Install/Content/FlexiblePageCest.php +++ b/tests/codeception/functional/Install/Content/FlexiblePageCest.php @@ -61,8 +61,8 @@ public function testDuplicateScroll(FunctionalTester $I) { 'type' => 'hs_basic_page', ]); $I->amOnPage($node->toUrl('edit-form')->toString()); - $I->scrollTo('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->scrollTo('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Collection'); $I->click('Collection', '.paragraphs-ee-add-dialog'); @@ -91,7 +91,7 @@ public function testHeroParagraph(FunctionalTester $I) { // Prevent JS alerts from firing before loading a new page. $I->executeJS('window.onbeforeunload = undefined;'); $I->fillField('Title', 'Demo Basic Page'); - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Banner'); $I->click('Banner image with full overlay and text', '.paragraphs-ee-add-dialog'); @@ -132,7 +132,7 @@ public function testPhotoAlbum(FunctionalTester $I) { // Prevent JS alerts from firing before loading a new page. $I->executeJS('window.onbeforeunload = undefined;'); $I->fillField('Title', 'Demo Basic Page'); - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Photo Album'); $I->click('Photo Album', '.paragraphs-ee-add-dialog'); @@ -236,7 +236,7 @@ public function testSpotlightSlider(FunctionalTester $I) { 'type' => 'hs_basic_page', ]); $I->amOnPage($node->toUrl('edit-form')->toString()); - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Spotlight'); $I->click('Spotlight(s)', '.paragraphs-ee-add-dialog'); @@ -308,7 +308,7 @@ public function testVerticalTimeline(FunctionalTester $I) { $I->logInWithRole('administrator'); $I->amOnPage('node/add/hs_basic_page'); $I->fillField('Title', $this->faker->words(3, TRUE)); - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Vertical Timeline'); $I->click('Vertical Timeline', '.paragraphs-ee-add-dialog'); @@ -352,7 +352,7 @@ public function testPostCard(FunctionalTester $I) { $I->logInWithRole('contributor'); $I->amOnPage('/node/add/hs_basic_page'); $I->fillField('Title', 'Demo Basic Page'); - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Postcard'); $I->click('Postcard', '.paragraphs-ee-add-dialog'); @@ -376,7 +376,7 @@ public function testAccordion(FunctionalTester $I) { $I->logInWithRole('contributor'); $I->amOnPage('/node/add/hs_basic_page'); $I->fillField('Title', 'Demo Basic Page'); - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'accordion'); $I->click('Accordion', '.paragraphs-ee-add-dialog'); @@ -405,7 +405,7 @@ public function testBackToTopExists(FunctionalTester $I) { } catch (\Exception $e) { // Add component if does not already exist. - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'text area'); $I->click('Text Area', '.paragraphs-ee-add-dialog'); @@ -446,7 +446,7 @@ public function testTextArea(FunctionalTester $I) { } catch (\Exception $e) { // Add component if does not already exist. - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'text area'); $I->click('Text Area', '.paragraphs-ee-add-dialog'); @@ -477,7 +477,7 @@ public function testCollections(FunctionalTester $I) { $I->amOnPage('/node/add/hs_basic_page'); $I->fillField('Title', 'Demo Basic Page'); // Add a Collection component to the page. - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Collection'); $I->click('Collection', '.paragraphs-ee-add-dialog'); diff --git a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php index f8a3d3534..0011f4097 100644 --- a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php +++ b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php @@ -67,8 +67,8 @@ public function testPrivatePageContent(FunctionalTester $I) { $I->amOnPage('/node/add/hs_private_page'); $I->fillField('Title', 'Test Private Page'); foreach ($this->fieldsToCheck as $component => $component_info) { - $I->scrollTo('.field--name-field-priv-wysiwyg-files'); - $I->click('+ Add'); + $I->scrollTo('#field-hs-priv-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-priv-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', $component); $I->click($component_info['component_button_name'], '.paragraphs-ee-add-dialog'); diff --git a/tests/codeception/functional/Install/Content/VideoEmbedCest.php b/tests/codeception/functional/Install/Content/VideoEmbedCest.php index f9573d3d9..85ff25a58 100644 --- a/tests/codeception/functional/Install/Content/VideoEmbedCest.php +++ b/tests/codeception/functional/Install/Content/VideoEmbedCest.php @@ -33,7 +33,7 @@ public function testVideoEmbed(FunctionalTester $I) { $I->fillField('Title', $this->faker->words(3, TRUE)); // Add text field. - $I->click('#field-hs-page-components-values .paragraphs-features__add-in-between__button'); + $I->click('#field-hs-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', 'Text Area'); $I->click('Text Area', '.paragraphs-ee-add-dialog'); From df15c7a32f3eca299e01b381ae7e336f5e1a858d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Thu, 5 Dec 2024 12:44:14 -0600 Subject: [PATCH 14/18] fix(shs-5958): fix private page tests --- .../functional/Install/Content/PrivatePageContentCest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php index 0011f4097..6e05f1932 100644 --- a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php +++ b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php @@ -67,7 +67,7 @@ public function testPrivatePageContent(FunctionalTester $I) { $I->amOnPage('/node/add/hs_private_page'); $I->fillField('Title', 'Test Private Page'); foreach ($this->fieldsToCheck as $component => $component_info) { - $I->scrollTo('#field-hs-priv-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); + $I->scrollTo('table[id^="field-hs-priv-page-components-values"] tr:last-child .paragraphs-features__add-in-between__button'); $I->click('#field-hs-priv-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', $component); From aec9d4648527d709dd0e34b78e4018ad4084cf7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20D=C3=ADaz=20Soto?= Date: Thu, 5 Dec 2024 13:00:06 -0600 Subject: [PATCH 15/18] fix(shs-5958): fix private page tests --- .../functional/Install/Content/PrivatePageContentCest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php index 6e05f1932..6888ec4fd 100644 --- a/tests/codeception/functional/Install/Content/PrivatePageContentCest.php +++ b/tests/codeception/functional/Install/Content/PrivatePageContentCest.php @@ -68,7 +68,7 @@ public function testPrivatePageContent(FunctionalTester $I) { $I->fillField('Title', 'Test Private Page'); foreach ($this->fieldsToCheck as $component => $component_info) { $I->scrollTo('table[id^="field-hs-priv-page-components-values"] tr:last-child .paragraphs-features__add-in-between__button'); - $I->click('#field-hs-priv-page-components-values tr:last-child .paragraphs-features__add-in-between__button'); + $I->click('table[id^="field-hs-priv-page-components-values"] tr:last-child .paragraphs-features__add-in-between__button'); $I->waitForText('Add Component'); $I->fillField('.paragraphs-ee-add-dialog input[type="search"]', $component); $I->click($component_info['component_button_name'], '.paragraphs-ee-add-dialog'); From c5aae88cec1635f4017729a96db63e452556fd03 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Thu, 5 Dec 2024 13:34:13 -0800 Subject: [PATCH 16/18] chore(SHS-5958): Remove unnecessary layout builder config --- .../core.entity_form_display.node.hs_basic_page.default.yml | 6 ------ ...ore.entity_form_display.node.hs_private_page.default.yml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/config/default/core.entity_form_display.node.hs_basic_page.default.yml b/config/default/core.entity_form_display.node.hs_basic_page.default.yml index dc226a8ff..23ea635b9 100644 --- a/config/default/core.entity_form_display.node.hs_basic_page.default.yml +++ b/config/default/core.entity_form_display.node.hs_basic_page.default.yml @@ -102,12 +102,6 @@ content: region: content settings: { } third_party_settings: { } - layout_builder__layout: - type: null - weight: 30 - region: content - settings: { } - third_party_settings: { } path: type: path weight: 7 diff --git a/config/default/core.entity_form_display.node.hs_private_page.default.yml b/config/default/core.entity_form_display.node.hs_private_page.default.yml index 44077d5e7..1f9cfecf8 100644 --- a/config/default/core.entity_form_display.node.hs_private_page.default.yml +++ b/config/default/core.entity_form_display.node.hs_private_page.default.yml @@ -83,12 +83,6 @@ content: audio: 0 video: 0 default: link - layout_builder__layout: - type: null - weight: 27 - region: content - settings: { } - third_party_settings: { } path: type: path weight: 5 From 732b1f794d2d03539ed317a413e597ad2fcccb93 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Tue, 10 Dec 2024 16:40:20 -0800 Subject: [PATCH 17/18] chore(SHS-5958): Revert hidden layout builder layout --- .../core.entity_form_display.node.hs_basic_page.default.yml | 3 ++- .../core.entity_form_display.node.hs_private_page.default.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/default/core.entity_form_display.node.hs_basic_page.default.yml b/config/default/core.entity_form_display.node.hs_basic_page.default.yml index 23ea635b9..ea27b16c3 100644 --- a/config/default/core.entity_form_display.node.hs_basic_page.default.yml +++ b/config/default/core.entity_form_display.node.hs_basic_page.default.yml @@ -152,4 +152,5 @@ content: region: content settings: { } third_party_settings: { } -hidden: { } +hidden: + layout_builder__layout: true diff --git a/config/default/core.entity_form_display.node.hs_private_page.default.yml b/config/default/core.entity_form_display.node.hs_private_page.default.yml index 1f9cfecf8..cb9dade9f 100644 --- a/config/default/core.entity_form_display.node.hs_private_page.default.yml +++ b/config/default/core.entity_form_display.node.hs_private_page.default.yml @@ -133,4 +133,5 @@ content: region: content settings: { } third_party_settings: { } -hidden: { } +hidden: + layout_builder__layout: true From 2375faa22fc60d1fa8049f4506bcfd0a221f2591 Mon Sep 17 00:00:00 2001 From: Marc Berger Date: Tue, 10 Dec 2024 16:42:11 -0800 Subject: [PATCH 18/18] chore(SHS-5958): Revert composer.lock to 11.6.1 version --- composer.lock | 134 +++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 66 deletions(-) diff --git a/composer.lock b/composer.lock index e3569684b..42929645d 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": "eab09310bd6e3449d54e55de1386cf13", + "content-hash": "42e1a82f04179a3c432bdd32a1485df7", "packages": [ { "name": "acquia/blt", @@ -1641,27 +1641,29 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.4", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9" + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9", - "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^12", - "phpstan/phpstan": "1.4.10 || 2.0.3", - "phpstan/phpstan-phpunit": "^1.0 || ^2", + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psr/log": "^1 || ^2 || ^3" + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -1669,7 +1671,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\Deprecations\\": "src" + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" } }, "notification-url": "https://packagist.org/downloads/", @@ -1680,9 +1682,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.4" + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" }, - "time": "2024-12-07T21:18:45+00:00" + "time": "2024-01-30T19:34:25+00:00" }, { "name": "doctrine/lexer", @@ -6573,17 +6575,17 @@ }, { "name": "drupal/gin_toolbar", - "version": "1.0.0-rc7", + "version": "1.0.0-rc6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/gin_toolbar.git", - "reference": "8.x-1.0-rc7" + "reference": "8.x-1.0-rc6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc7.zip", - "reference": "8.x-1.0-rc7", - "shasum": "9ad2bdc0f1664ff3c5fb6767986e508c92196692" + "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc6.zip", + "reference": "8.x-1.0-rc6", + "shasum": "542def14b9a5435efb4e021d384fa3f7b0fc6e78" }, "require": { "drupal/core": "^9 || ^10 || ^11" @@ -6591,8 +6593,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0-rc7", - "datestamp": "1733734483", + "version": "8.x-1.0-rc6", + "datestamp": "1718368950", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -12737,23 +12739,23 @@ "sut/libraries/{$name}": [ "type:drupal-library" ], - "sut/themes/unish/{$name}": [ - "drupal/empty_theme" - ], - "sut/drush/contrib/{$name}": [ - "type:drupal-drush" - ], "sut/modules/unish/{$name}": [ "drupal/devel" ], - "sut/themes/contrib/{$name}": [ - "type:drupal-theme" + "sut/themes/unish/{$name}": [ + "drupal/empty_theme" ], "sut/modules/contrib/{$name}": [ "type:drupal-module" ], "sut/profiles/contrib/{$name}": [ "type:drupal-profile" + ], + "sut/themes/contrib/{$name}": [ + "type:drupal-theme" + ], + "sut/drush/contrib/{$name}": [ + "type:drupal-drush" ] } }, @@ -14100,16 +14102,16 @@ }, { "name": "league/csv", - "version": "9.19.0", + "version": "9.18.0", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "f81df48a012a9e86d077e74eaff666fd15bfab88" + "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/f81df48a012a9e86d077e74eaff666fd15bfab88", - "reference": "f81df48a012a9e86d077e74eaff666fd15bfab88", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/b02d010e4055ae992247f6ffd1e7b103ef2a0790", + "reference": "b02d010e4055ae992247f6ffd1e7b103ef2a0790", "shasum": "" }, "require": { @@ -14121,12 +14123,12 @@ "ext-xdebug": "*", "friendsofphp/php-cs-fixer": "^3.64.0", "phpbench/phpbench": "^1.3.1", - "phpstan/phpstan": "^1.12.11", + "phpstan/phpstan": "^1.12.6", "phpstan/phpstan-deprecation-rules": "^1.2.1", - "phpstan/phpstan-phpunit": "^1.4.1", + "phpstan/phpstan-phpunit": "^1.4.0", "phpstan/phpstan-strict-rules": "^1.6.1", - "phpunit/phpunit": "^10.5.16 || ^11.4.3", - "symfony/var-dumper": "^6.4.8 || ^7.1.8" + "phpunit/phpunit": "^10.5.16 || ^11.4.1", + "symfony/var-dumper": "^6.4.8 || ^7.1.5" }, "suggest": { "ext-dom": "Required to use the XMLConverter and the HTMLConverter classes", @@ -14183,7 +14185,7 @@ "type": "github" } ], - "time": "2024-12-08T08:09:35+00:00" + "time": "2024-10-18T08:14:48+00:00" }, { "name": "leongersen/nouislider", @@ -15500,16 +15502,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.6", + "version": "v0.12.5", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c" + "reference": "36a03ff27986682c22985e56aabaf840dd173cb5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c", - "reference": "3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/36a03ff27986682c22985e56aabaf840dd173cb5", + "reference": "36a03ff27986682c22985e56aabaf840dd173cb5", "shasum": "" }, "require": { @@ -15573,9 +15575,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.6" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.5" }, - "time": "2024-12-07T20:08:52+00:00" + "time": "2024-11-29T06:14:30+00:00" }, { "name": "ralouphie/getallheaders", @@ -17203,8 +17205,8 @@ "type": "library", "extra": { "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -17359,8 +17361,8 @@ "type": "library", "extra": { "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -17521,8 +17523,8 @@ "type": "library", "extra": { "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -17679,8 +17681,8 @@ "type": "metapackage", "extra": { "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "notification-url": "https://packagist.org/downloads/", @@ -17744,8 +17746,8 @@ "type": "library", "extra": { "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -17824,8 +17826,8 @@ "type": "library", "extra": { "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -17901,8 +17903,8 @@ "type": "library", "extra": { "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -22837,16 +22839,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.1", + "version": "5.6.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8" + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", - "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/f3558a4c23426d12bffeaab463f8a8d8b681193c", + "reference": "f3558a4c23426d12bffeaab463f8a8d8b681193c", "shasum": "" }, "require": { @@ -22895,9 +22897,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.0" }, - "time": "2024-12-07T09:39:29+00:00" + "time": "2024-11-12T11:25:25+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -25775,8 +25777,8 @@ "type": "library", "extra": { "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { @@ -25851,8 +25853,8 @@ "type": "library", "extra": { "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": {