diff -u b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php --- b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php +++ b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php @@ -10,7 +10,6 @@ use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase; use Drupal\migrate\Row; - /** * Drupal 7 role source from database. * @@ -21,21 +20,11 @@ class FilterFormat extends DrupalSqlBase { /** - * The format current. - * - * @var int - */ - protected $format_current; - - /** * {@inheritdoc} */ public function query() { - return $this->select('filter_format', 'f') - ->fields('f') - // Ignore the plain text format. - ->condition('format', 'plain_text', '<>'); - } + return $this->select('filter_format', 'f')->fields('f'); + } /** * {@inheritdoc} @@ -44,7 +33,7 @@ return array( 'format' => $this->t('Format ID.'), 'name' => $this->t('The name of the filter format.'), - 'cache' => $this->t('Flag to indicate whether format is cacheable. (1 = cacheable, 0 = not cacheable).'), + 'cache' => $this->t('Flag to indicate whether format is cacheable (1 = cacheable, 0 = not cacheable).'), 'status'=>$this->t('The status of the filter format'), 'weight'=>$this->t('The weight of the filter format'), ); @@ -58,14 +47,6 @@ $filters = $this->select('filter', 'f') ->fields('f') ->condition('format', $row->getSourceProperty('format')) - ->condition('name', [ - 'filter_html', - 'filter_autop', - 'filter_url', - 'filter_htmlcorrector', - 'filter_html_escape', - 'php_code', - ], 'IN') ->condition('status', 1) ->execute() ->fetchAllAssoc('name'); diff -u b/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php b/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php --- b/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php +++ b/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php @@ -58,9 +58,7 @@ $this->assertEntity('custom_text_format', 'Custom Text format', ['filter_autop', 'filter_html']); $this->assertEntity('filtered_html', 'Filtered HTML', ['filter_autop', 'filter_html', 'filter_htmlcorrector', 'filter_url']); $this->assertEntity('full_html', 'Full HTML', ['filter_autop', 'filter_htmlcorrector', 'filter_url']); - - // The plain text format is skipped by the source plugin. - $this->assertNull(FilterFormat::load('plain_text')); + $this->assertEntity('plain_text', 'Plain text', ['filter_autop', 'filter_html_escape', 'filter_url']); // Ensure that filter-specific settings were migrated. /** @var \Drupal\filter\FilterFormatInterface $format */