Update to Drupal 8.1.8. For more information, see https://www.drupal.org/project/drupal/releases/8.1.8

core/modules/menu_link_content/migration_templates/menu_links.yml

@@ -12,6 +12,7 @@ process:
   menu_name:
     -
       plugin: migration
+      # The menu migration is in the system module.
       migration: menu
       source: menu_name
     -
@@ -20,7 +21,7 @@ process:
         management: admin
       bypass: true
   'link/uri':
-    plugin: internal_uri
+    plugin: link_uri
     source:
       - link_path
   'link/options': options

core/modules/menu_link_content/src/Plugin/migrate/process/d6/InternalUri.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Drupal\menu_link_content\Plugin\migrate\process\d6;
-
-use Drupal\migrate\MigrateExecutableInterface;
-use Drupal\migrate\ProcessPluginBase;
-use Drupal\migrate\Row;
-
-/**
- * Process a path into an 'internal:' URI.
- *
- * @MigrateProcessPlugin(
- *   id = "internal_uri"
- * )
- */
-class InternalUri extends ProcessPluginBase {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
-    list($path) = $value;
-
-    if (parse_url($path, PHP_URL_SCHEME) === NULL) {
-      return 'internal:/' . $path;
-    }
-    return $path;
-  }
-
-}

core/modules/menu_link_content/src/Plugin/migrate/process/d6/LinkUri.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace Drupal\menu_link_content\Plugin\migrate\process\d6;
+
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\Core\Url;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\ProcessPluginBase;
+use Drupal\migrate\Row;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Processes a link path into an 'internal:' or 'entity:' URI.
+ *
+ * @MigrateProcessPlugin(
+ *   id = "link_uri"
+ * )
+ */
+class LinkUri extends ProcessPluginBase implements ContainerFactoryPluginInterface {
+
+  /**
+   * The entity type manager, used to fetch entity link templates.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * Constructs a LinkUri object.
+   *
+   * @param array $configuration
+   *   A configuration array containing information about the plugin instance.
+   * @param string $plugin_id
+   *   The plugin_id for the plugin instance.
+   * @param mixed $plugin_definition
+   *   The plugin implementation definition.
+   * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager
+   *   The entity type manager, used to fetch entity link templates.
+   */
+  public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityTypeManagerInterface $entity_type_manager) {
+    parent::__construct($configuration, $plugin_id, $plugin_definition);
+    $this->entityTypeManager = $entity_type_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
+    return new static(
+      $configuration,
+      $plugin_id,
+      $plugin_definition,
+      $container->get('entity_type.manager')
+    );
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function transform($value, MigrateExecutableInterface $migrate_executable, Row $row, $destination_property) {
+    list($path) = $value;
+    $path = ltrim($path, '/');
+
+    if (parse_url($path, PHP_URL_SCHEME) === NULL) {
+      $path = 'internal:/' . $path;
+
+      // Convert entity URIs to the entity scheme, if the path matches a route
+      // of the form "entity.$entity_type_id.canonical".
+      // @see \Drupal\Core\Url::fromEntityUri()
+      $url = Url::fromUri($path);
+      if ($url->isRouted()) {
+        $route_name = $url->getRouteName();
+        foreach (array_keys($this->entityTypeManager->getDefinitions()) as $entity_type_id) {
+          if ($route_name == "entity.$entity_type_id.canonical" && isset($url->getRouteParameters()[$entity_type_id])) {
+            return "entity:$entity_type_id/" . $url->getRouteParameters()[$entity_type_id];
+          }
+        }
+      }
+    }
+    return $path;
+  }
+
+}

core/modules/menu_link_content/tests/src/Unit/Plugin/migrate/process/d6/LinkUriTest.php

@@ -0,0 +1,136 @@
+<?php
+
+namespace Drupal\Tests\menu_link_content\Unit\Plugin\migrate\process\d6;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Url;
+use Drupal\menu_link_content\Plugin\migrate\process\d6\LinkUri;
+use Drupal\migrate\MigrateExecutableInterface;
+use Drupal\migrate\Row;
+use Drupal\Tests\UnitTestCase;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Path\PathValidator;
+
+/**
+ * Tests \Drupal\menu_link_content\Plugin\migrate\process\d6\LinkUri.
+ *
+ * @group menu_link_content
+ *
+ * @coversDefaultClass \Drupal\menu_link_content\Plugin\migrate\process\d6\LinkUri
+ */
+class LinkUriTest extends UnitTestCase {
+
+  /**
+   * The entity type manager prophecy used in the test.
+   *
+   * @var \Prophecy\Prophecy\ProphecyInterface|\Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The 'link_uri' process plugin being tested.
+   *
+   * @var \Drupal\menu_link_content\Plugin\migrate\process\d6\LinkUri
+   */
+  protected $processPlugin;
+
+  /**
+   * The path validator prophecy used in the test.
+   *
+   * @var \Drupal\Core\Path\PathValidator
+   */
+  protected $pathValidator;
+
+  /**
+   * The fake entity type ID used in the test.
+   *
+   * @var string
+   */
+  protected $entityTypeId = 'the_entity_type_id';
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $this->entityTypeManager = $this->prophesize(EntityTypeManagerInterface::class);
+    $this->entityTypeManager->getDefinitions()->willReturn([$this->entityTypeId => '']);
+    $this->processPlugin = new LinkUri([], 'link_uri', [], $this->entityTypeManager->reveal());
+
+    // Url::fromInternalUri() accesses the path validator from the global
+    // container.
+    // @see \Drupal\Core\Url::fromInternalUri()
+    $this->pathValidator = $this->prophesize(PathValidator::class);
+    $container = new ContainerBuilder();
+    $container->set('path.validator', $this->pathValidator->reveal());
+    \Drupal::setContainer($container);
+  }
+
+  /**
+   * Tests LinkUri::transform().
+   *
+   * @param array $value
+   *   The value to pass to LinkUri::transform().
+   * @param string $expected
+   *   The expected return value of LinkUri::transform().
+   * @param \Drupal\Core\Url $url
+   *   (optional) The URL that the path validator prophecy will return.
+   *
+   * @dataProvider providerTestTransform
+   *
+   * @covers ::transform
+   */
+  public function testTransform(array $value, $expected, Url $url = NULL) {
+    $migrate_executable = $this->prophesize(MigrateExecutableInterface::class);
+    $row = $this->prophesize(Row::class);
+
+    if ($url) {
+      $this->pathValidator->getUrlIfValidWithoutAccessCheck(reset($value))->willReturn($url);
+    }
+
+    $actual = $this->processPlugin->transform($value, $migrate_executable->reveal(), $row->reveal(), 'link/uri');
+    $this->assertEquals($expected, $actual);
+  }
+
+  /**
+   * Provides test cases for LinkUriTest::testTransform().
+   *
+   * @return array
+   *   An array of test cases, each which the following values:
+   *   - The value array to pass to LinkUri::transform().
+   *   - The expected path returned by LinkUri::transform().
+   *   - (optional) A URL object that the path validator prophecy will return.
+   */
+  public function providerTestTransform() {
+    $tests = [];
+
+    $value = ['http://example.com'];
+    $expected = 'http://example.com';
+    $tests['with_scheme'] = [$value, $expected];
+
+    $value = ['/test'];
+    $expected = 'internal:/test';
+    $tests['leading_slash'] = [$value, $expected];
+
+    $value = ['test'];
+    $expected = 'internal:/test';
+    $tests['without_scheme'] = [$value, $expected];
+
+    $url = Url::fromRoute('route_name');
+    $tests['with_route'] = [$value, $expected, $url];
+
+    $url = Url::fromRoute('entity.not_an_entity_type_id.canonical');
+    $tests['without_entity_type'] = [$value, $expected, $url];
+
+    $url = Url::fromRoute('entity.the_entity_type_id.canonical');
+    $tests['without_route_parameter'] = [$value, $expected, $url];
+
+    $url = Url::fromRoute('entity.the_entity_type_id.canonical', ['the_entity_type_id' => 'the_entity_id']);
+    $expected = 'entity:the_entity_type_id/the_entity_id';
+    $tests['entity_path'] = [$value, $expected, $url];
+
+    return $tests;
+  }
+
+}