diff --git a/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php b/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php index 7aeb142..bb71418 100644 --- a/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php +++ b/core/modules/link/src/Plugin/migrate/field/d7/LinkField.php @@ -45,15 +45,4 @@ public function processFieldInstance(MigrationInterface $migration) { $migration->mergeProcessOfProperty('settings/title', $process); } - /** - * {@inheritdoc} - */ - public function processFieldValues(MigrationInterface $migration, $field_name, $data) { - $process = [ - 'plugin' => 'field_link', - 'source' => $field_name, - ]; - $migration->mergeProcessOfProperty($field_name, $process); - } - } diff --git a/core/modules/link/src/Plugin/migrate/process/FieldLink.php b/core/modules/link/src/Plugin/migrate/process/FieldLink.php index deb4150..e9ecd9c 100644 --- a/core/modules/link/src/Plugin/migrate/process/FieldLink.php +++ b/core/modules/link/src/Plugin/migrate/process/FieldLink.php @@ -18,8 +18,9 @@ * All external URIs need to be converted to use a URI scheme. * * Available configuration keys - * - uri_scheme: The URI scheme prefix to use for missing scheme urls. Defaults - * to 'http://', which was the default in Drupal 6 and Drupal 7. + * - uri_scheme: (optional) The URI scheme prefix to use for missing scheme + * urls. Defaults to 'http://', which was the default in Drupal 6 and Drupal + * 7. * * Examples: * diff --git a/core/modules/link/tests/src/Unit/Plugin/migrate/process/FieldLinkTest.php b/core/modules/link/tests/src/Unit/Plugin/migrate/process/FieldLinkTest.php index ee8aaaf..005c072 100644 --- a/core/modules/link/tests/src/Unit/Plugin/migrate/process/FieldLinkTest.php +++ b/core/modules/link/tests/src/Unit/Plugin/migrate/process/FieldLinkTest.php @@ -18,7 +18,7 @@ class FieldLinkTest extends UnitTestCase { * * @dataProvider canonicalizeUriDataProvider */ - public function testCanonicalizeUri($url, $expected, $configuration) { + public function testCanonicalizeUri($url, $expected, $configuration = []) { $link_plugin = new FieldLink($configuration, '', [], $this->getMock(MigrationInterface::class)); $transformed = $link_plugin->transform([ 'url' => $url, @@ -36,37 +36,30 @@ public function canonicalizeUriDataProvider() { 'Simple front-page' => [ '', 'internal:/', - [], ], 'Front page with query' => [ '?query=1', 'internal:/?query=1', - [], ], 'No leading forward slash' => [ 'node/10', 'internal:/node/10', - [], ], 'Leading forward slash' => [ '/node/10', 'internal:/node/10', - [], ], 'Existing scheme' => [ 'scheme:test', 'scheme:test', - [], ], 'Absolute URL with protocol prefix' => [ 'http://www.google.com', 'http://www.google.com', - [], ], 'Absolute URL without protocol prefix' => [ 'www.yahoo.com', 'http://www.yahoo.com', - [], ], 'Absolute URL without protocol prefix nor www' => [ 'yahoo.com', @@ -76,7 +69,6 @@ public function canonicalizeUriDataProvider() { 'Absolute URL with non-standard characters' => [ 'http://www.ßÀÑÐ¥ƒå¢ë.com', 'http://www.ßÀÑÐ¥ƒå¢ë.com', - [], ], ]; }