diff --git a/core/modules/migrate_drupal/src/EventSubscriber/NodeTranslationSubscriber.php b/core/modules/migrate_drupal/src/EventSubscriber/NodeTranslationSubscriber.php index c082d11..68e78e7 100644 --- a/core/modules/migrate_drupal/src/EventSubscriber/NodeTranslationSubscriber.php +++ b/core/modules/migrate_drupal/src/EventSubscriber/NodeTranslationSubscriber.php @@ -85,7 +85,7 @@ public function onPostImport(MigrateImportEvent $event) { /** * {@inheritdoc} */ - static function getSubscribedEvents() { + public static function getSubscribedEvents() { $events[MigrateEvents::POST_ROW_SAVE] = ['onPostRowSave']; $events[MigrateEvents::POST_IMPORT] = ['onPostImport']; diff --git a/core/modules/node_translation_redirect/src/EventSubscriber/ExceptionSubscriber.php b/core/modules/node_translation_redirect/src/EventSubscriber/ExceptionSubscriber.php index 06e6abf..db1d7d9 100644 --- a/core/modules/node_translation_redirect/src/EventSubscriber/ExceptionSubscriber.php +++ b/core/modules/node_translation_redirect/src/EventSubscriber/ExceptionSubscriber.php @@ -80,7 +80,7 @@ public function onException(GetResponseForExceptionEvent $event) { /** * {@inheritdoc} */ - static function getSubscribedEvents() { + public static function getSubscribedEvents() { $events[KernelEvents::EXCEPTION] = ['onException']; return $events; diff --git a/core/modules/node_translation_redirect/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php b/core/modules/node_translation_redirect/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php index aa2292b..006d99d 100644 --- a/core/modules/node_translation_redirect/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php +++ b/core/modules/node_translation_redirect/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php @@ -4,7 +4,6 @@ use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; /** * Tests node translation redirections. diff --git a/core/modules/node_translation_redirect/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php b/core/modules/node_translation_redirect/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php index ecae1db..9062ab5 100644 --- a/core/modules/node_translation_redirect/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php +++ b/core/modules/node_translation_redirect/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php @@ -4,7 +4,6 @@ use Drupal\Tests\migrate_drupal\Kernel\d7\MigrateDrupal7TestBase; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; /** * Tests node translation redirections. @@ -16,12 +15,12 @@ class NodeTranslationRedirectTest extends MigrateDrupal7TestBase { /** * {@inheritdoc} */ - public static $modules = array( + public static $modules = [ 'content_translation', 'language', 'node', 'text', - ); + ]; /** * {@inheritdoc} diff --git a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php index 2edf258..d8719b0 100644 --- a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php +++ b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php @@ -35,6 +35,8 @@ protected function setUp() { $this->executeMigrations([ 'language', + 'd7_language_types', + 'd7_language_negotiation_settings', 'd7_user_role', 'd7_user', 'd7_node_type',