diff -u b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
--- b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php
@@ -301,8 +301,8 @@
   public function prepareRow(Row $row) {
     $result = TRUE;
     try {
-      $result_hook = $this->moduleHandler->invokeAll('migrate_prepare_row', array($row, $this, $this->migration));
-      $result_named_hook = $this->moduleHandler->invokeAll('migrate_' . $this->migration->id() . '_prepare_row', array($row, $this, $this->migration));
+      $result_hook = $this->moduleHandler->invokeAll('migrate_prepare_row', [$row, $this, $this->migration]);
+      $result_named_hook = $this->moduleHandler->invokeAll('migrate_' . $this->migration->id() . '_prepare_row', [$row, $this, $this->migration]);
       // We will skip if any hook returned FALSE.
       $skip = ($result_hook && in_array(FALSE, $result_hook)) || ($result_named_hook && in_array(FALSE, $result_named_hook));
       $save_to_map = TRUE;
diff -u b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
--- b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
+++ b/core/modules/migrate/src/Plugin/migrate/source/SqlBase.php
@@ -12,7 +12,6 @@
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\id_map\Sql;
 use Drupal\migrate\Plugin\MigrateIdMapInterface;
-use Drupal\migrate\Plugin\RequirementsInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 // cspell:ignore destid sourceid
@@ -414,7 +413,7 @@
     }
 
     // If we are tracking changes, we also need to retrieve all rows to compare
-    // hashes
+    // hashes.
     if ($this->trackChanges) {
       return FALSE;
     }
reverted:
--- b/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
+++ a/core/modules/migrate/tests/src/Kernel/MigrateSqlSourceTestBase.php
@@ -2,13 +2,9 @@
 
 namespace Drupal\Tests\migrate\Kernel;
 
-use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Cache\MemoryCounterBackendFactory;
 use Drupal\sqlite\Driver\Database\sqlite\Connection;
 use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
-use Drupal\Core\Extension\ModuleHandlerInterface;
-use Drupal\Core\State\StateInterface;
 
 /**
  * Base class for tests of Migrate source plugins that use a database.
diff -u b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
--- b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateSourceTest.php
@@ -292,7 +292,7 @@
    */
   public function testPrepareRow() {
     $this->migrationConfiguration['id'] = 'test_migration';
-  
+
     $module_handler = $this->prophesize(ModuleHandlerInterface::class);
 
     // Get a new migration with an id.
@@ -365,7 +365,7 @@
     $this->migrationConfiguration['id'] = 'test_migration';
 
     $module_handler = $this->prophesize(ModuleHandlerInterface::class);
-    
+
     $migration = $this->getMigration();
     $source = new StubSourcePlugin([], '', [], $migration, $module_handler->reveal(), $this->getMock(CacheBackendInterface::class));
     $row = new Row();
@@ -395,7 +395,6 @@
 
     $module_handler = $this->prophesize(ModuleHandlerInterface::class);
 
-
     $migration = $this->getMigration();
     $source = new StubSourcePlugin([], '', [], $migration, $module_handler->reveal(), $this->getMock(CacheBackendInterface::class));
     $row = new Row();
@@ -434,7 +433,7 @@
     $cache = $this->getMock(CacheBackendInterface::class);
     $source = new StubSourceGeneratorPlugin([], '', [], $migration, $module_handler, $cache);
 
-    // Test the default value of the skipCount Value;
+    // Test the default value of the skipCount Value;.
     $this->assertTrue($source->getSkipCount());
     $this->assertTrue($source->getCacheCounts());
     $this->assertTrue($source->getTrackChanges());
diff -u b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
--- b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php
@@ -5,7 +5,6 @@
 use Drupal\Component\Plugin\DependentPluginInterface;
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Entity\DependencyTrait;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
@@ -29,7 +28,11 @@
  * @see \Drupal\migrate\Plugin\migrate\source\SqlBase
  * @see \Drupal\migrate\Plugin\migrate\source\SourcePluginBase
  */
-abstract class DrupalSqlBase extends SqlBase implements DependentPluginInterface {abstract class DrupalSqlBase extends SqlBase implements RequirementsInterface, DependentPluginInterface {
+abstract class DrupalSqlBase extends SqlBase implements DependentPluginInterface {
+/**
+ *
+ */
+abstract class DrupalSqlBase extends SqlBase implements RequirementsInterface, DependentPluginInterface {
 
   use DependencyTrait;
 
diff -u b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
--- b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/EmptySource.php
@@ -9,7 +9,6 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
 use Drupal\migrate\Plugin\migrate\source\EmptySource as BaseEmptySource;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**
  * Source returning an empty row with Drupal specific config dependencies.
diff -u b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
--- b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
+++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php
@@ -78,7 +78,7 @@
     $state = $this->createMock('Drupal\Core\State\StateInterface');
     /** @var \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager */
     $entity_type_manager = $this->createMock('Drupal\Core\Entity\EntityTypeManagerInterface');
-    $this->base = new TestDrupal6SqlBase($this->migrationConfiguration, $plugin, array(), $this->getMigration(), $module_handler, $cache, $state, $entity_manager);
+    $this->base = new TestDrupal6SqlBase($this->migrationConfiguration, $plugin, [], $this->getMigration(), $module_handler, $cache, $state, $entity_manager);
     $this->base->setDatabase($this->getDatabase($this->databaseContents));
   }
 
@@ -136,7 +136,6 @@
 
 namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
 
-use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
 
diff -u b/core/modules/node/src/Plugin/migrate/source/d6/Node.php b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
--- b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
+++ b/core/modules/node/src/Plugin/migrate/source/d6/Node.php
@@ -4,7 +4,6 @@
 
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Database\Query\SelectInterface;
-use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Extension\ModuleHandler;
 use Drupal\Core\State\StateInterface;
 use Drupal\migrate\Plugin\MigrationInterface;
@@ -109,19 +108,19 @@
     $this->handleTranslations($query);
 
     $query->fields('n', [
-        'nid',
-        'type',
-        'language',
-        'status',
-        'created',
-        'changed',
-        'comment',
-        'promote',
-        'moderate',
-        'sticky',
-        'tnid',
-        'translate',
-      ])
+      'nid',
+      'type',
+      'language',
+      'status',
+      'created',
+      'changed',
+      'comment',
+      'promote',
+      'moderate',
+      'sticky',
+      'tnid',
+      'translate',
+    ])
       ->fields('nr', [
         'title',
         'body',
@@ -186,7 +185,7 @@
    * {@inheritdoc}
    */
   public function prepareRow(Row $row) {
-    // format = 0 can happen when the body field is hidden. Set the format to 1
+    // Format = 0 can happen when the body field is hidden. Set the format to 1
     // to avoid migration map issues (since the body field isn't used anyway).
     if ($row->getSourceProperty('format') === '0') {
       $row->setSourceProperty('format', $this->filterDefaultFormat);