Verified Commit 8ca43627 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3176393 by quietone, huzooka, benjifisher: Use... 

Issue #3176393 by quietone, huzooka, benjifisher: Use SourcePluginBase::getSourceModule() in DrupalSqlBase::checkRequirements()

(cherry picked from commit 12df2086)
parent 56990e5f

core/modules/dblog/tests/src/Kernel/Migrate/d6/MigrateDblogConfigsTest.php

+6 −1
Original line number Diff line number Diff line
@@ -24,13 +24,18 @@ class MigrateDblogConfigsTest extends MigrateDrupal6TestBase { 
   */

  protected function setUp(): void {

    parent::setUp();

    // Enable dblog in the source database so that requirements are met.

    $this->sourceDatabase->update('system')

      ->condition('name', 'dblog')

      ->fields(['status' => '1'])

      ->execute();

    $this->executeMigration('d6_dblog_settings');

  }



  /**

   * Tests migration of dblog variables to dblog.settings.yml.

   */

  public function testBookSettings() {

  public function testDblogSettings() {

    $config = $this->config('dblog.settings');

    $this->assertSame(10000, $config->get('row_limit'));

    $this->assertConfigSchema(\Drupal::service('config.typed'), 'dblog.settings', $config->get());

core/modules/field/migrations/d6_field.yml

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ source: 
  constants:

    entity_type: node

    langcode: en

  # Phone is here since it does not use a migrate field plugin.

  source_module: phone

process:

  entity_type: 'constants/entity_type'

  status: active

core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php

+5 −5
Original line number Diff line number Diff line
@@ -104,18 +104,18 @@ public static function create(ContainerInterface $container, array $configuratio 
  public function checkRequirements() {

    parent::checkRequirements();

    if ($this->pluginDefinition['requirements_met'] === TRUE) {

      if (isset($this->pluginDefinition['source_module'])) {

        if ($this->moduleExists($this->pluginDefinition['source_module'])) {

      if ($source_module = $this->getSourceModule()) {

        if ($this->moduleExists($source_module)) {

          if (isset($this->pluginDefinition['minimum_version'])) {

            $minimum_version = $this->pluginDefinition['minimum_version'];

            $installed_version = $this->getModuleSchemaVersion($this->pluginDefinition['source_module']);

            $minimum_version = (int) $this->pluginDefinition['minimum_version'];

            $installed_version = (int) $this->getModuleSchemaVersion($source_module);

            if ($minimum_version > $installed_version) {

              throw new RequirementsException('Required minimum version ' . $this->pluginDefinition['minimum_version'], ['minimum_version' => $this->pluginDefinition['minimum_version']]);

            }

          }

        }

        else {

          throw new RequirementsException('The module ' . $this->pluginDefinition['source_module'] . ' is not enabled in the source site.', ['source_module' => $this->pluginDefinition['source_module']]);

          throw new RequirementsException('The module ' . $source_module . ' is not enabled in the source site.', ['source_module' => $source_module]);

        }

      }

    }

core/modules/syslog/tests/src/Kernel/Migrate/d6/MigrateSyslogConfigsTest.php

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,11 @@ class MigrateSyslogConfigsTest extends MigrateDrupal6TestBase { 
   */

  protected function setUp(): void {

    parent::setUp();

    // Enable syslog in the source database so that requirements are met.

    $this->sourceDatabase->update('system')

      ->condition('name', 'syslog')

      ->fields(['status' => '1'])

      ->execute();

    $this->executeMigration('d6_syslog_settings');

  }