Commit a75deb2f authored by Kristof De Jaeger's avatar Kristof De Jaeger
Browse files

Issue #3278537 by Berdir, nkoporec, ricovandevin, levmyshkin: D10... 

Issue #3278537 by Berdir, nkoporec, ricovandevin, levmyshkin: D10 compatibility | Declaration of Drupal\field_group\Routing\RouteSubscriber::getSubscribedEvents() must be compatible with Drupal\Core\Routing\RouteSubscriberBase::getSubscribedEvents()
parent a0b7ec69

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
    "license": "GPL-2.0-or-later",

    "minimum-stability": "dev",

    "require": {

        "drupal/core": "^8.8 || ^9"

        "drupal/core": "^9.2 || ^10"

    },

    "require-dev": {

        "drupal/jquery_ui_accordion": "^1.0"

contrib/field_group_migrate/field_group_migrate.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ name: 'Field Group Migrate' 
type: module

description: 'Provides the ability to migrate field groups from D6/D7 to D8.'

package: Migration

core_version_requirement: ^8.8 || ^9

core_version_requirement: ^9.2 || ^10

dependencies:

  - field_group:field_group

contrib/field_group_migrate/tests/src/Functional/MigrateUiFieldGroupTest.php

+17 −8
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ class MigrateUiFieldGroupTest extends MigrateUpgradeTestBase { 
   * {@inheritdoc}

   */

  protected function getSourceBasePath() {

    return drupal_get_path('module', 'migrate_drupal_ui') . '/tests/src/Functional/d7/files';

    return \Drupal::service('extension.list.module')

      ->getPath('migrate_drupal_ui') . '/tests/src/Functional/d7/files';

  }



  /**
@@ -37,9 +38,17 @@ class MigrateUiFieldGroupTest extends MigrateUpgradeTestBase { 
   */

  protected function setUp() {

    parent::setUp();



    $extension_list_module = \Drupal::service('extension.list.module');



    $migrate_drupal_path = $extension_list_module

      ->getPath('migrate_drupal') . '/tests/fixtures/drupal7.php';

    $field_group_migrate = $extension_list_module

      ->getPath('field_group_migrate') . '/tests/fixtures/drupal7.php';



    // Field Group's migration database fixture extends Drupal core's fixture.

    $this->loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal7.php');

    $this->loadFixture(drupal_get_path('module', 'field_group_migrate') . '/tests/fixtures/drupal7.php');

    $this->loadFixture($migrate_drupal_path);

    $this->loadFixture($field_group_migrate);

  }



  /**
@@ -115,7 +124,7 @@ class MigrateUiFieldGroupTest extends MigrateUpgradeTestBase { 
    $session = $this->assertSession();

    $session->responseContains("Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal");



    $this->drupalPostForm(NULL, [], 'Continue');

    $this->submitForm([], 'Continue');

    $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.');



    $driver = $connection_options['driver'];
@@ -138,7 +147,7 @@ class MigrateUiFieldGroupTest extends MigrateUpgradeTestBase { 
    }

    $edits = $this->translatePostValues($edit);



    $this->drupalPostForm(NULL, $edits, 'Review upgrade');

    $this->submitForm($edits, 'Review upgrade');

  }



  /**
@@ -154,13 +163,13 @@ class MigrateUiFieldGroupTest extends MigrateUpgradeTestBase { 
    // @see https://www.drupal.org/node/2928118

    // @see https://www.drupal.org/node/3105503

    if ($this->getSession()->getPage()->findButton('I acknowledge I may lose data. Continue anyway.')) {

      $this->drupalPostForm(NULL, [], 'I acknowledge I may lose data. Continue anyway.');

      $this->submitForm([], 'I acknowledge I may lose data. Continue anyway.');

      $assert_session->statusCodeEquals(200);

    }



    // Perform the upgrade.

    $this->drupalPostForm(NULL, [], 'Perform upgrade');

    $this->assertText('Congratulations, you upgraded Drupal!');

    $this->submitForm([], 'Perform upgrade');

    $this->assertSession()->pageTextContains('Congratulations, you upgraded Drupal!');



    // Have to reset all the statics after migration to ensure entities are

    // loadable.

field_group.info.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,6 +2,6 @@ name: 'Field Group' 
type: module

description: 'Provides the ability to group your fields on both form and display.'

package : Fields

core_version_requirement: ^8.8 || ^9

core_version_requirement: ^9.2 || ^10

dependencies:

  - drupal:field

field_group.libraries.yml

+7 −7
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ field_ui: 
      css/field_group.field_ui.css: {}

  dependencies:

    - core/jquery

    - core/jquery.once

    - core/once

    - core/drupal

    - core/drupalSettings
@@ -15,7 +15,7 @@ core: 
    js/field_group.js: {}

  dependencies:

    - core/jquery

    - core/jquery.once

    - core/once

    - core/drupal

    - core/drupalSettings
@@ -24,7 +24,7 @@ formatter.accordion: 
    formatters/accordion/accordion.js: {}

  dependencies:

    - core/jquery

    - core/jquery.once

    - core/once

    - jquery_ui_accordion/accordion



formatter.html_element:
@@ -32,14 +32,14 @@ formatter.html_element: 
    formatters/html_element/html-element.js: {}

  dependencies:

    - core/jquery

    - core/jquery.once

    - core/once



formatter.fieldset:

  js:

    formatters/fieldset/fieldset.js: {}

  dependencies:

    - core/jquery

    - core/jquery.once

    - core/once



formatter.details:

  js:
@@ -52,7 +52,7 @@ formatter.tabs: 
    formatters/tabs/tabs.js: {}

  dependencies:

    - core/jquery

    - core/jquery.once

    - core/once

    - core/modernizr



element.horizontal_tabs:
@@ -64,6 +64,6 @@ element.horizontal_tabs: 
      formatters/tabs/horizontal-tabs.css: {}

  dependencies:

    - core/jquery

    - core/jquery.once

    - core/once

    - core/drupal.collapse

    - core/modernizr