Commit b992e26f authored by heddn's avatar heddn Committed by heddn
Browse files

Issue #3125501 by heddn: Fix failing tests on D9

parent bc5f9cac
......@@ -72,6 +72,10 @@ class Migration extends ConfigEntityBase implements MigrationInterface {
/**
* Create a configuration entity from a core migration plugin's configuration.
*
* Note the list of properties being transplanted from the plugin instance or
* definition into the Migration config entity must remain in sync with the
* keys listed in the "config_export" annotation key of this class.
*
* @param string $plugin_id
* ID of a migration plugin managed by MigrationPluginManager.
* @param string $new_plugin_id
......@@ -79,10 +83,6 @@ class Migration extends ConfigEntityBase implements MigrationInterface {
*
* @return \Drupal\migrate_plus\Entity\MigrationInterface
* A Migration configuration entity (not saved to persistent storage).
*
* Note the list of properties being transplanted from the plugin instance or
* definition into the Migration config entity must remain in sync with the
* keys listed in the "config_export" annotation key of this class.
*/
public static function createEntityFromPlugin($plugin_id, $new_plugin_id) {
/** @var \Drupal\migrate\Plugin\MigrationPluginManagerInterface $plugin_manager */
......
......@@ -28,7 +28,7 @@ class EntityGenerateTest extends KernelTestBase implements MigrateMessageInterfa
/**
* {@inheritdoc}
*/
public static $modules = [
protected static $modules = [
'migrate_plus',
'migrate',
'user',
......@@ -87,7 +87,7 @@ class EntityGenerateTest extends KernelTestBase implements MigrateMessageInterfa
$this->installEntitySchema('user');
$this->installSchema('system', ['sequences']);
$this->installSchema('user', 'users_data');
$this->installConfig($this->modules);
$this->installConfig(self::$modules);
// Create a vocabulary.
$vocabulary = Vocabulary::create([
......
......@@ -22,7 +22,7 @@ class EntityLookupTest extends KernelTestBase {
/**
* {@inheritdoc}
*/
public static $modules = [
protected static $modules = [
'migrate_plus',
'migrate',
'user',
......
......@@ -190,10 +190,10 @@ class TestHttp extends Http {
* @param array $responses
* An array of responses (arrays), with each consisting of properties,
* ordered: response code, content-type and response body.
* @param \PHPUnit_Framework_MockObject_MockObject $authenticator
* @param object $authenticator
* Mocked authenticator plugin.
*/
public function mockHttpClient(array $responses, \PHPUnit_Framework_MockObject_MockObject $authenticator = NULL) {
public function mockHttpClient(array $responses, object $authenticator = NULL) {
// Set mocked authentication plugin to be used for the request auth plugin.
$this->authenticator = $authenticator;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment