diff --git a/core/lib/Drupal/Core/Form/ConfirmFormHelper.php b/core/lib/Drupal/Core/Form/ConfirmFormHelper.php
index 8d608f1..c5e2572 100644
--- a/core/lib/Drupal/Core/Form/ConfirmFormHelper.php
+++ b/core/lib/Drupal/Core/Form/ConfirmFormHelper.php
@@ -34,7 +34,7 @@ public static function buildCancelLink(ConfirmFormInterface $form, Request $requ
// If a destination is specified, that serves as the cancel link.
if ($query->has('destination')) {
$options = UrlHelper::parse($query->get('destination'));
- $url = Url::fromUri('user-path:/' . $options['path'], $options);
+ $url = Url::fromUserInput('/' . $options['path'], $options);
}
// Check for a route-based cancel link.
else {
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 6a8c17a..a0242fd 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -24,6 +24,17 @@ class Url {
use DependencySerializationTrait;
/**
+ * Scheme for URIs from user input.
+ *
+ * To create a URL for paths from user input that may or may not correspond
+ * to a valid Drupal route, use Url::fromUserInput().
+ *
+ * @see \Drupal\Core\Url::fromUserInput()
+ * @see \Drupal\Core\Url::fromInternalUri()
+ */
+ const SCHEME_INTERNAL = 'internal';
+
+ /**
* The URL generator.
*
* @var \Drupal\Core\Routing\UrlGeneratorInterface
@@ -166,7 +177,8 @@ public function __construct($route_name, $route_parameters = array(), $options =
* @return \Drupal\Core\Url
* A new Url object for a routed (internal to Drupal) URL.
*
- * @see static::fromUri()
+ * @see \Drupal\Core\Url::fromUserInput()
+ * @see \Drupal\Core\Url::fromUri()
*/
public static function fromRoute($route_name, $route_parameters = array(), $options = array()) {
return new static($route_name, $route_parameters, $options);
@@ -190,6 +202,41 @@ public static function fromRouteMatch(RouteMatchInterface $route_match) {
}
/**
+ * Creates a Url object for a path from user input.
+ *
+ * Use this method to create a URL for paths from user input that may or may
+ * not correspond to a valid Drupal route.
+ *
+ * @param string $path
+ * A path string from user input. Only three types of paths are allowed:
+ * - Site paths, beginning with a '/'.
+ * - Query strings, beginning with a '?'.
+ * - Fragments (for jump links within the same page), beginning with a '#'.
+ * @param array $options
+ * (optional) An array of options. See Url::fromUri() for details.
+ *
+ * @return static
+ * A new Url object based on user input.
+ *
+ * @throws \InvalidArgumentException
+ * Thrown when the submitted path does not begin with one of the allowed
+ * characters. See above.
+ *
+ * @todo The intent here is to support a user interaction pattern where
+ * entering one of the three allowed characters at the beginning of a
+ * field denotes that the user wants to link to a specific path on the
+ * site, with all other input interpreted as an attempt to autocomplete the
+ * label of a specific resource. How do we document that, and how do we
+ * establish the expectation for other APIs and for UIs?
+ */
+ public static function fromUserInput($path, $options = []) {
+ if ((strpos($path, '/') !== 0) && (strpos($path, '#') !== 0) && (strpos($path, '?') !== 0)) {
+ throw new \InvalidArgumentException(String::format('The path @path is not valid as user input. User-input paths must begin with one of the following characters: / # ?', ['@path' => $path]));
+ }
+ return static::fromUri(static::SCHEME_INTERNAL . ':' . $path, $options);
+ }
+
+ /**
* Creates a new Url object from a URI.
*
* This method is for generating URLs for URIs that:
@@ -205,7 +252,7 @@ public static function fromRouteMatch(RouteMatchInterface $route_match) {
*
* @param string $uri
* The URI of the resource including the scheme. For user input that may
- * correspond to a Drupal route, use user-path: for the scheme. For paths
+ * correspond to a Drupal route, use internal: for the scheme. For paths
* that are known not to be handled by the Drupal routing system (such as
* static files), use base: for the scheme to get a link relative to the
* Drupal base path (like the HTML element). For a link to an entity
@@ -227,7 +274,7 @@ public static function fromRouteMatch(RouteMatchInterface $route_match) {
* defined, the current scheme is used, so the user stays on HTTP or HTTPS
* respectively. TRUE enforces HTTPS and FALSE enforces HTTP.
*
- * Note: the user-path: scheme should be avoided except when processing actual
+ * Note: the internal: scheme should be avoided except when processing actual
* user input that may or may not correspond to a Drupal route. Normally use
* Url::fromRoute() for code linking to any any Drupal page.
*
@@ -239,7 +286,8 @@ public static function fromRouteMatch(RouteMatchInterface $route_match) {
* @throws \InvalidArgumentException
* Thrown when the passed in path has no scheme.
*
- * @see static::fromRoute()
+ * @see \Drupal\Core\Url::fromRoute()
+ * @see \Drupal\Core\Url::fromUserInput()
*/
public static function fromUri($uri, $options = []) {
$uri_parts = parse_url($uri);
@@ -247,7 +295,7 @@ public static function fromUri($uri, $options = []) {
throw new \InvalidArgumentException(String::format('The URI "@uri" is malformed.', ['@uri' => $uri]));
}
if (empty($uri_parts['scheme'])) {
- throw new \InvalidArgumentException(String::format('The URI "@uri" is invalid. You must use a valid URI scheme. Use base: for items like a static file that needs the base path. Use user-path: for user input without a scheme. Use entity: for referencing the canonical route of a content entity. Use route: for directly representing a route name and parameters.', ['@uri' => $uri]));
+ throw new \InvalidArgumentException(String::format('The URI "@uri" is invalid. You must use a valid URI scheme.', ['@uri' => $uri]));
}
$uri_parts += ['path' => ''];
// Discard empty fragment in $options for consistency with parse_url().
@@ -272,8 +320,8 @@ public static function fromUri($uri, $options = []) {
if ($uri_parts['scheme'] === 'entity') {
$url = static::fromEntityUri($uri_parts, $uri_options, $uri);
}
- elseif ($uri_parts['scheme'] === 'user-path') {
- $url = static::fromUserPathUri($uri_parts, $uri_options);
+ elseif ($uri_parts['scheme'] === static::SCHEME_INTERNAL) {
+ $url = static::fromInternalUri($uri_parts, $uri_options);
}
elseif ($uri_parts['scheme'] === 'route') {
$url = static::fromRouteUri($uri_parts, $uri_options, $uri);
@@ -317,46 +365,46 @@ protected static function fromEntityUri(array $uri_parts, array $options, $uri)
}
/**
- * Creates a new Url object for 'user-path:' URIs.
+ * Creates a new Url object for 'internal:' URIs.
*
* Important note: the URI minus the scheme can NOT simply be validated by a
* \Drupal\Core\Path\PathValidatorInterface implementation. The semantics of
- * the 'user-path:' URI scheme are different:
+ * the 'internal:' URI scheme are different:
* - PathValidatorInterface accepts paths without a leading slash (e.g.
* 'node/add') as well as 2 special paths: '' and '', which are
* mapped to the correspondingly named routes.
- * - 'user-path:' URIs store paths with a leading slash that represents the
- * root — i.e. the front page — (e.g. 'user-path:/node/add'), and doesn't
+ * - 'internal:' URIs store paths with a leading slash that represents the
+ * root — i.e. the front page — (e.g. 'internal:/node/add'), and doesn't
* have any exceptions.
*
- * To clarify, a few examples of path plus corresponding 'user-path:' URI:
- * - 'node/add' -> 'user-path:/node/add'
- * - 'node/add?foo=bar' -> 'user-path:/node/add?foo=bar'
- * - 'node/add#kitten' -> 'user-path:/node/add#kitten'
- * - '' -> 'user-path:/'
- * - 'foo=bar' -> 'user-path:/?foo=bar'
- * - '#kitten' -> 'user-path:/#kitten'
- * - '' -> 'user-path:'
- * - 'foo=bar' -> 'user-path:?foo=bar'
- * - '#kitten' -> 'user-path:#kitten'
- *
- * Therefore, when using a PathValidatorInterface to validate 'user-path:'
+ * To clarify, a few examples of path plus corresponding 'internal:' URI:
+ * - 'node/add' -> 'internal:/node/add'
+ * - 'node/add?foo=bar' -> 'internal:/node/add?foo=bar'
+ * - 'node/add#kitten' -> 'internal:/node/add#kitten'
+ * - '' -> 'internal:/'
+ * - 'foo=bar' -> 'internal:/?foo=bar'
+ * - '#kitten' -> 'internal:/#kitten'
+ * - '' -> 'internal:'
+ * - 'foo=bar' -> 'internal:?foo=bar'
+ * - '#kitten' -> 'internal:#kitten'
+ *
+ * Therefore, when using a PathValidatorInterface to validate 'internal:'
* URIs, we must map:
- * - 'user-path:' (path component is '') to the special '' path
- * - 'user-path:/' (path component is '/') to the special '' path
- * - 'user-path:/some-path' (path component is '/some-path') to 'some-path'
+ * - 'internal:' (path component is '') to the special '' path
+ * - 'internal:/' (path component is '/') to the special '' path
+ * - 'internal:/some-path' (path component is '/some-path') to 'some-path'
*
* @param array $uri_parts
- * Parts from an URI of the form user-path:{path} as from parse_url().
+ * Parts from an URI of the form internal:{path} as from parse_url().
* @param array $options
- * An array of options, see static::fromUri() for details.
+ * An array of options. See Url::fromUri() for details.
*
- * @return \Drupal\Core\Url
- * A new Url object for a 'user-path:' URI.
+ * @return static
+ * A new Url object for a 'internal:' URI.
*/
- protected static function fromUserPathUri(array $uri_parts, array $options) {
+ protected static function fromInternalUri(array $uri_parts, array $options) {
// Both PathValidator::getUrlIfValidWithoutAccessCheck() and 'base:' URIs
- // only accept/contain paths without a leading slash, unlike 'user-path:'
+ // only accept/contain paths without a leading slash, unlike 'internal:'
// URIs, for which the leading slash means "relative to Drupal root" and
// "relative to Symfony app root" (just like in Symfony/Drupal 8 routes).
if (empty($uri_parts['path'])) {
@@ -460,7 +508,7 @@ protected function setUnrouted() {
* Generates a URI string that represents tha data in the Url object.
*
* The URI will typically have the scheme of route: even if the object was
- * constructed using an entity: or user-path: scheme. A user-path: URI that
+ * constructed using an entity: or internal: scheme. A internal: URI that
* does not match a Drupal route with be returned here with the base: scheme,
* and external URLs will be returned in their original form.
*
@@ -665,7 +713,7 @@ public function setAbsolute($absolute = TRUE) {
* string or fragment specified by the options array.
*
* If this Url object was constructed from a Drupal route or from an internal
- * URI (URIs using the user-path:, base:, or entity: schemes), the returned
+ * URI (URIs using the internal:, base:, or entity: schemes), the returned
* string will either be a relative URL like /node/1 or an absolute URL like
* http://example.com/node/1 depending on the options array, plus any
* specified query string or fragment.
diff --git a/core/modules/field_ui/src/FieldUI.php b/core/modules/field_ui/src/FieldUI.php
index 9ee73c7..d8284f2 100644
--- a/core/modules/field_ui/src/FieldUI.php
+++ b/core/modules/field_ui/src/FieldUI.php
@@ -61,7 +61,7 @@ public static function getNextDestination(array $destinations) {
$options['query']['destinations'] = $destinations;
}
// Redirect to any given path within the same domain.
- $next_destination = Url::fromUri('user-path:/' . $options['path']);
+ $next_destination = Url::fromUserInput('/' . $options['path']);
}
return $next_destination;
}
diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
index 7546ef1..4eca617 100644
--- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
+++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php
@@ -210,7 +210,7 @@ public function viewElements(FieldItemListInterface $items) {
// attribute.
// @todo Does RDF need a URL rather than an internal URI here?
// @see \Drupal\rdf\Tests\Field\LinkFieldRdfaTest.
- $content = str_replace('user-path:/', '', $item->uri);
+ $content = str_replace(Url::SCHEME_INTERNAL . ':/', '', $item->uri);
$item->_attributes += array('content' => $content);
}
}
diff --git a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
index 2a25702..95e11c3 100644
--- a/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
+++ b/core/modules/link/src/Plugin/Field/FieldWidget/LinkWidget.php
@@ -42,7 +42,7 @@ public static function defaultSettings() {
}
/**
- * Gets the URI without the 'user-path:' scheme, for display while editing.
+ * Gets the URI without the 'internal:' scheme, for display while editing.
*
* @param string $uri
* The URI to get the displayable string for.
@@ -51,7 +51,7 @@ public static function defaultSettings() {
*/
protected static function getUriAsDisplayableString($uri) {
$scheme = parse_url($uri, PHP_URL_SCHEME);
- if ($scheme === 'user-path') {
+ if ($scheme === Url::SCHEME_INTERNAL) {
$uri_reference = explode(':', $uri, 2)[1];
// @todo Present the leading slash to the user and hence delete the next
// block in https://www.drupal.org/node/2418017. There, we will also
@@ -77,7 +77,7 @@ protected static function getUriAsDisplayableString($uri) {
/**
* Gets the user-entered string as a URI.
*
- * Schemeless URIs are treated as 'user-path:' URIs.
+ * Schemeless URIs are treated as 'internal:' URIs.
*
* @param string $string
* The user-entered string.
@@ -115,7 +115,7 @@ protected static function getUserEnteredStringAsUri($string) {
$string = '/' . $string;
}
- return 'user-path:' . $string;
+ return Url::SCHEME_INTERNAL . ':' . $string;
}
}
return $string;
@@ -327,7 +327,7 @@ public function massageFormValues(array $values, array $form, FormStateInterface
/**
* {@inheritdoc}
*
- * Override the '%uri' message parameter, to ensure that 'user-path:' URIs
+ * Override the '%uri' message parameter, to ensure that 'internal:' URIs
* show a validation error message that doesn't mention that scheme.
*/
public function flagErrors(FieldItemListInterface $items, ConstraintViolationListInterface $violations, array $form, FormStateInterface $form_state) {
diff --git a/core/modules/menu_link_content/menu_link_content.module b/core/modules/menu_link_content/menu_link_content.module
index 59b12e1..0a269a2 100644
--- a/core/modules/menu_link_content/menu_link_content.module
+++ b/core/modules/menu_link_content/menu_link_content.module
@@ -7,6 +7,7 @@
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\system\MenuInterface;
+use Drupal\Core\Url;
/**
* Implements hook_help().
@@ -45,7 +46,7 @@ function menu_link_content_path_insert($path) {
}
/**
- * Helper function to update plugin definition using user-path scheme.
+ * Helper function to update plugin definition using internal scheme.
*
* @param string $path
* The path alias.
@@ -58,7 +59,7 @@ function _menu_link_content_update_path_alias($path) {
/** @var \Drupal\menu_link_content\MenuLinkContentInterface[] $entities */
$entities = \Drupal::entityManager()
->getStorage('menu_link_content')
- ->loadByProperties(['link__uri' => 'user-path:/' . $path]);
+ ->loadByProperties(['link__uri' => Url::SCHEME_INTERNAL .':/' . $path]);
foreach ($entities as $menu_link) {
$menu_link_manager->updateDefinition($menu_link->getPluginId(), $menu_link->getPluginDefinition(), FALSE);
}
diff --git a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
index 24e5dd9..e89f25f 100644
--- a/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
+++ b/core/modules/menu_link_content/src/Entity/MenuLinkContent.php
@@ -11,6 +11,7 @@
use Drupal\Core\Entity\EntityStorageInterface;
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Field\BaseFieldDefinition;
+use Drupal\Core\Url;
use Drupal\link\LinkItemInterface;
use Drupal\menu_link_content\MenuLinkContentInterface;
@@ -186,7 +187,7 @@ public static function preCreate(EntityStorageInterface $storage, array &$values
public function preSave(EntityStorageInterface $storage) {
parent::preSave($storage);
- if (parse_url($this->link->uri, PHP_URL_SCHEME) === 'user-path') {
+ if (parse_url($this->link->uri, PHP_URL_SCHEME) === Url::SCHEME_INTERNAL) {
$this->setRequiresRediscovery(TRUE);
}
else {
diff --git a/core/modules/menu_link_content/src/Tests/LinksTest.php b/core/modules/menu_link_content/src/Tests/LinksTest.php
index f7500ee..92f18b6 100644
--- a/core/modules/menu_link_content/src/Tests/LinksTest.php
+++ b/core/modules/menu_link_content/src/Tests/LinksTest.php
@@ -67,14 +67,14 @@ function createLinkHierarchy($module = 'menu_test') {
);
$parent = $base_options + array(
- 'link' => ['uri' => 'user-path:/menu-test/hierarchy/parent'],
+ 'link' => ['uri' => 'internal:/menu-test/hierarchy/parent'],
);
$link = entity_create('menu_link_content', $parent);
$link->save();
$links['parent'] = $link->getPluginId();
$child_1 = $base_options + array(
- 'link' => ['uri' => 'user-path:/menu-test/hierarchy/parent/child'],
+ 'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child'],
'parent' => $links['parent'],
);
$link = entity_create('menu_link_content', $child_1);
@@ -82,7 +82,7 @@ function createLinkHierarchy($module = 'menu_test') {
$links['child-1'] = $link->getPluginId();
$child_1_1 = $base_options + array(
- 'link' => ['uri' => 'user-path:/menu-test/hierarchy/parent/child2/child'],
+ 'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child2/child'],
'parent' => $links['child-1'],
);
$link = entity_create('menu_link_content', $child_1_1);
@@ -90,7 +90,7 @@ function createLinkHierarchy($module = 'menu_test') {
$links['child-1-1'] = $link->getPluginId();
$child_1_2 = $base_options + array(
- 'link' => ['uri' => 'user-path:/menu-test/hierarchy/parent/child2/child'],
+ 'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child2/child'],
'parent' => $links['child-1'],
);
$link = entity_create('menu_link_content', $child_1_2);
@@ -98,7 +98,7 @@ function createLinkHierarchy($module = 'menu_test') {
$links['child-1-2'] = $link->getPluginId();
$child_2 = $base_options + array(
- 'link' => ['uri' => 'user-path:/menu-test/hierarchy/parent/child'],
+ 'link' => ['uri' => 'internal:/menu-test/hierarchy/parent/child'],
'parent' => $links['parent'],
);
$link = entity_create('menu_link_content', $child_2);
@@ -128,7 +128,7 @@ public function testCreateLink() {
$options = array(
'menu_name' => 'menu_test',
'bundle' => 'menu_link_content',
- 'link' => [['uri' => 'user-path:/']],
+ 'link' => [['uri' => 'internal:/']],
);
$link = entity_create('menu_link_content', $options);
$link->save();
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
index aaf2e7f..c7a1ae1 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php
@@ -46,7 +46,7 @@ public function testRediscover() {
// Set up a custom menu link pointing to a specific path.
MenuLinkContent::create([
'title' => 'Example',
- 'link' => [['uri' => 'user-path:/example-path']],
+ 'link' => [['uri' => 'internal:/example-path']],
'menu_name' => 'tools',
])->save();
$menu_tree = \Drupal::menuTree()->load('tools', new MenuTreeParameters());
diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php b/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php
index 315d018..4f33182 100644
--- a/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php
+++ b/core/modules/menu_link_content/src/Tests/MenuLinkContentUITest.php
@@ -57,7 +57,7 @@ protected function getAdministratorPermissions() {
*/
protected function createEntity($values, $langcode, $bundle_name = NULL) {
$values['menu_name'] = 'tools';
- $values['link']['uri'] = 'user-path:/admin/structure/menu';
+ $values['link']['uri'] = 'internal:/admin/structure/menu';
$values['title'] = 'Test title';
return parent::createEntity($values, $langcode, $bundle_name);
@@ -70,7 +70,7 @@ public function testTranslationLinkOnMenuEditForm() {
$this->drupalGet('admin/structure/menu/manage/tools');
$this->assertNoLink(t('Translate'));
- $menu_link_content = MenuLinkContent::create(['menu_name' => 'tools', 'link' => ['uri' => 'user-path:/admin/structure/menu']]);
+ $menu_link_content = MenuLinkContent::create(['menu_name' => 'tools', 'link' => ['uri' => 'internal:/admin/structure/menu']]);
$menu_link_content->save();
$this->drupalGet('admin/structure/menu/manage/tools');
$this->assertLink(t('Translate'));
diff --git a/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php b/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php
index af965af..3caf26f 100644
--- a/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php
+++ b/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php
@@ -64,7 +64,7 @@ public function testPathAliasChange() {
$menu_link_content = MenuLinkContent::create([
'title' => 'Menu title',
- 'link' => ['uri' => 'user-path:/my-blog'],
+ 'link' => ['uri' => 'internal:/my-blog'],
'menu_name' => 'tools',
]);
$menu_link_content->save();
diff --git a/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php b/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
index b332f123..40477f0 100644
--- a/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuCacheTagsTest.php
@@ -83,7 +83,7 @@ public function testMenuBlock() {
'title' => 'Alpaca',
'menu_name' => 'llama',
'link' => [[
- 'uri' => 'user-path:/',
+ 'uri' => 'internal:/',
]],
'bundle' => 'menu_name',
));
diff --git a/core/modules/menu_ui/src/Tests/MenuTest.php b/core/modules/menu_ui/src/Tests/MenuTest.php
index a994bb4..3c133aa 100644
--- a/core/modules/menu_ui/src/Tests/MenuTest.php
+++ b/core/modules/menu_ui/src/Tests/MenuTest.php
@@ -105,8 +105,8 @@ function testMenu() {
$this->verifyAccess(403);
foreach ($this->items as $item) {
- // Menu link URIs are stored as 'user-path:/node/$nid'.
- $node = Node::load(str_replace('user-path:/node/', '', $item->link->uri));
+ // Menu link URIs are stored as 'internal:/node/$nid'.
+ $node = Node::load(str_replace('internal:/node/', '', $item->link->uri));
$this->verifyMenuLink($item, $node);
}
diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml b/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml
index 41b7fa3..0d443a6 100644
--- a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml
+++ b/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml
@@ -23,7 +23,7 @@ process:
migration: d6_menu
source: menu_name
'link/uri':
- plugin: userpath_uri
+ plugin: internal_uri
source:
- link_path
'link/options': options
diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPathUri.php b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPathUri.php
index ade7f8c..86af7d7 100644
--- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPathUri.php
+++ b/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/UserPathUri.php
@@ -10,12 +10,13 @@
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate\ProcessPluginBase;
use Drupal\migrate\Row;
+use Drupal\Core\Url;
/**
- * Process a path into a 'user-path:' URI.
+ * Process a path into an 'internal:' URI.
*
* @MigrateProcessPlugin(
- * id = "userpath_uri"
+ * id = "internal_uri"
* )
*/
class UserPathUri extends ProcessPluginBase {
@@ -27,7 +28,7 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro
list($path) = $value;
if (parse_url($path, PHP_URL_SCHEME) === NULL) {
- return 'user-path:/' . $path;
+ return Url::SCHEME_INTERNAL . ':/' . $path;
}
return $path;
}
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
index e299052..05d9aac 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateMenuLinkTest.php
@@ -57,7 +57,7 @@ public function testMenuLinks() {
$this->assertIdentical($menu_link->isEnabled(), TRUE);
$this->assertIdentical($menu_link->isExpanded(), FALSE);
$this->assertIdentical($menu_link->link->options, ['attributes' => ['title' => 'Test menu link 1']]);
- $this->assertIdentical($menu_link->link->uri, 'user-path:/user/login');
+ $this->assertIdentical($menu_link->link->uri, 'internal:/user/login');
$this->assertIdentical($menu_link->getWeight(), 15);
$menu_link = entity_load('menu_link_content', 139);
@@ -67,7 +67,7 @@ public function testMenuLinks() {
$this->assertIdentical($menu_link->isEnabled(), TRUE);
$this->assertIdentical($menu_link->isExpanded(), TRUE);
$this->assertIdentical($menu_link->link->options, ['query' => 'foo=bar', 'attributes' => ['title' => 'Test menu link 2']]);
- $this->assertIdentical($menu_link->link->uri, 'user-path:/admin');
+ $this->assertIdentical($menu_link->link->uri, 'internal:/admin');
$this->assertIdentical($menu_link->getWeight(), 12);
$menu_link = entity_load('menu_link_content', 140);
diff --git a/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php
index 34db4c5..4d643d0 100644
--- a/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php
+++ b/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php
@@ -67,7 +67,7 @@ public function testAllFormattersInternal() {
// Set up test values.
$this->testValue = 'admin';
$this->entity = entity_create('entity_test', array());
- $this->entity->{$this->fieldName}->uri = 'user-path:/admin';
+ $this->entity->{$this->fieldName}->uri = 'internal:/admin';
// Set up the expected result.
// AssertFormatterRdfa looks for a full path.
@@ -86,7 +86,7 @@ public function testAllFormattersFront() {
// Set up test values.
$this->testValue = '/';
$this->entity = entity_create('entity_test', array());
- $this->entity->{$this->fieldName}->uri = 'user-path:/';
+ $this->entity->{$this->fieldName}->uri = 'internal:/';
// Set up the expected result.
$expected_rdf = array(
diff --git a/core/modules/shortcut/src/Controller/ShortcutSetController.php b/core/modules/shortcut/src/Controller/ShortcutSetController.php
index 528b02d..6a30d7c 100644
--- a/core/modules/shortcut/src/Controller/ShortcutSetController.php
+++ b/core/modules/shortcut/src/Controller/ShortcutSetController.php
@@ -65,7 +65,7 @@ public function addShortcutLinkInline(ShortcutSetInterface $shortcut_set, Reques
'title' => $name,
'shortcut_set' => $shortcut_set->id(),
'link' => array(
- 'uri' => 'user-path:/' . $link,
+ 'uri' => 'internal:/' . $link,
),
));
diff --git a/core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php b/core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php
index 5265745..c67e0d0 100644
--- a/core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutCacheTagsTest.php
@@ -46,7 +46,7 @@ protected function createEntity() {
'shortcut_set' => 'default',
'title' => t('Llama'),
'weight' => 0,
- 'link' => [['uri' => 'user-path:/admin']],
+ 'link' => [['uri' => 'internal:/admin']],
));
$shortcut->save();
diff --git a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
index 677e471..5ac4e43 100644
--- a/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutLinksTest.php
@@ -66,7 +66,7 @@ public function testShortcutLinkAdd() {
$this->assertResponse(200);
$saved_set = ShortcutSet::load($set->id());
$paths = $this->getShortcutInformation($saved_set, 'link');
- $this->assertTrue(in_array('user-path:/' . ($test_path == '' ? '' : $test_path), $paths), 'Shortcut created: ' . $test_path);
+ $this->assertTrue(in_array('internal:/' . ($test_path == '' ? '' : $test_path), $paths), 'Shortcut created: ' . $test_path);
if (in_array($test_path, $test_cases_non_access)) {
$this->assertNoLink($title, String::format('Shortcut link %url not accessible on the page.', ['%url' => $test_path]));
@@ -168,7 +168,7 @@ public function testShortcutLinkChangePath() {
$this->drupalPostForm('admin/config/user-interface/shortcut/link/' . $shortcut->id(), array('title[0][value]' => $shortcut->getTitle(), 'link[0][uri]' => $new_link_path), t('Save'));
$saved_set = ShortcutSet::load($set->id());
$paths = $this->getShortcutInformation($saved_set, 'link');
- $this->assertTrue(in_array('user-path:/' . $new_link_path, $paths), 'Shortcut path changed: ' . $new_link_path);
+ $this->assertTrue(in_array('internal:/' . $new_link_path, $paths), 'Shortcut path changed: ' . $new_link_path);
$this->assertLinkByHref($new_link_path, 0, 'Shortcut with new path appears on the page.');
}
diff --git a/core/modules/shortcut/src/Tests/ShortcutTestBase.php b/core/modules/shortcut/src/Tests/ShortcutTestBase.php
index 20c0ce1..92c8f0b 100644
--- a/core/modules/shortcut/src/Tests/ShortcutTestBase.php
+++ b/core/modules/shortcut/src/Tests/ShortcutTestBase.php
@@ -66,7 +66,7 @@ protected function setUp() {
'title' => t('Add content'),
'weight' => -20,
'link' => array(
- 'uri' => 'user-path:/node/add',
+ 'uri' => 'internal:/node/add',
),
));
$shortcut->save();
@@ -76,7 +76,7 @@ protected function setUp() {
'title' => t('All content'),
'weight' => -19,
'link' => array(
- 'uri' => 'user-path:/admin/content',
+ 'uri' => 'internal:/admin/content',
),
));
$shortcut->save();
diff --git a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
index 5f70a23..f72e1be 100644
--- a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
@@ -50,7 +50,7 @@ protected function getTranslatorPermissions() {
* {@inheritdoc}
*/
protected function createEntity($values, $langcode, $bundle_name = NULL) {
- $values['link']['uri'] = 'user-path:/user';
+ $values['link']['uri'] = 'internal:/user';
return parent::createEntity($values, $langcode, $bundle_name);
}
diff --git a/core/modules/system/src/Tests/Common/UrlTest.php b/core/modules/system/src/Tests/Common/UrlTest.php
index 4511c8e..6beeb31 100644
--- a/core/modules/system/src/Tests/Common/UrlTest.php
+++ b/core/modules/system/src/Tests/Common/UrlTest.php
@@ -31,7 +31,7 @@ function testLinkXSS() {
// Test \Drupal::l().
$text = $this->randomMachineName();
$path = "";
- $link = \Drupal::l($text, Url::fromUri('user-path:/' . $path));
+ $link = \Drupal::l($text, Url::fromUserInput('/' . $path));
$sanitized_path = check_url(Url::fromUri('base:' . $path)->toString());
$this->assertTrue(strpos($link, $sanitized_path) !== FALSE, format_string('XSS attack @path was filtered by _l().', array('@path' => $path)));
diff --git a/core/modules/system/src/Tests/Menu/BreadcrumbTest.php b/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
index ab06c99..a4496d0 100644
--- a/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
+++ b/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
@@ -248,7 +248,7 @@ function testBreadCrumbs() {
$menu_links = entity_load_multiple_by_properties('menu_link_content', array(
'title' => $edit['title[0][value]'],
// @todo Use link.uri once https://www.drupal.org/node/2391217 is in.
- 'link__uri' => 'user-path:/taxonomy/term/' . $term->id(),
+ 'link__uri' => 'internal:/taxonomy/term/' . $term->id(),
));
$tags[$name]['link'] = reset($menu_links);
$parent_mlid = $tags[$name]['link']->getPluginId();
diff --git a/core/modules/system/src/Tests/Menu/MenuLinkTreeTest.php b/core/modules/system/src/Tests/Menu/MenuLinkTreeTest.php
index 0ec8dfd..1dbca60 100644
--- a/core/modules/system/src/Tests/Menu/MenuLinkTreeTest.php
+++ b/core/modules/system/src/Tests/Menu/MenuLinkTreeTest.php
@@ -67,9 +67,9 @@ public function testDeleteLinksInMenu() {
\Drupal::entityManager()->getStorage('menu')->create(array('id' => 'menu1'))->save();
\Drupal::entityManager()->getStorage('menu')->create(array('id' => 'menu2'))->save();
- \Drupal::entityManager()->getStorage('menu_link_content')->create(array('link' => ['uri' => 'user-path:/menu_name_test'], 'menu_name' => 'menu1', 'bundle' => 'menu_link_content'))->save();
- \Drupal::entityManager()->getStorage('menu_link_content')->create(array('link' => ['uri' => 'user-path:/menu_name_test'], 'menu_name' => 'menu1', 'bundle' => 'menu_link_content'))->save();
- \Drupal::entityManager()->getStorage('menu_link_content')->create(array('link' => ['uri' => 'user-path:/menu_name_test'], 'menu_name' => 'menu2', 'bundle' => 'menu_link_content'))->save();
+ \Drupal::entityManager()->getStorage('menu_link_content')->create(array('link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu1', 'bundle' => 'menu_link_content'))->save();
+ \Drupal::entityManager()->getStorage('menu_link_content')->create(array('link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu1', 'bundle' => 'menu_link_content'))->save();
+ \Drupal::entityManager()->getStorage('menu_link_content')->create(array('link' => ['uri' => 'internal:/menu_name_test'], 'menu_name' => 'menu2', 'bundle' => 'menu_link_content'))->save();
$output = $this->linkTree->load('menu1', new MenuTreeParameters());
$this->assertEqual(count($output), 2);
diff --git a/core/modules/system/tests/modules/form_test/src/Form/FormTestRedirectForm.php b/core/modules/system/tests/modules/form_test/src/Form/FormTestRedirectForm.php
index c1b0a83..720b9d5 100644
--- a/core/modules/system/tests/modules/form_test/src/Form/FormTestRedirectForm.php
+++ b/core/modules/system/tests/modules/form_test/src/Form/FormTestRedirectForm.php
@@ -55,7 +55,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
if (!$form_state->isValueEmpty('redirection')) {
if (!$form_state->isValueEmpty('destination')) {
// The destination is a random URL, so we can't use routed URLs.
- $form_state->setRedirectUrl(Url::fromUri('user-path:/' . $form_state->getValue('destination')));
+ $form_state->setRedirectUrl(Url::fromUserInput('/' . $form_state->getValue('destination')));
}
}
else {
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 93bd846..c4ae390 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -1998,7 +1998,8 @@ public function renderMoreLink() {
if ($this->getOption('link_display') == 'custom_url' && $override_path = $this->getOption('link_url')) {
$tokens = $this->getArgumentsTokens();
$path = $this->viewsTokenReplace($override_path, $tokens);
- $url = Url::fromUri('user-path:/' . $path);
+ // @todo Views should expect the leading slash; followup issue.
+ $url = Url::fromUserInput('/' . $path);
}
// Otherwise, use the URL for the display.
else {
diff --git a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
index d60fcba..fdb8f62 100644
--- a/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/src/Plugin/views/field/FieldPluginBase.php
@@ -1248,7 +1248,9 @@ public function renderText($alter) {
$more_link_path = Unicode::substr($more_link_path, Unicode::strlen($base_path));
}
- $more_link = \Drupal::l($more_link_text, CoreUrl::fromUri('user-path:/' . $more_link_path), array('attributes' => array('class' => array('views-more-link'))));
+ // @todo Convert Views to expect a leading slash for path
+ // configurations. Needs followup issue.
+ $more_link = \Drupal::l($more_link_text, CoreUrl::fromUserInput('/' . $more_link_path), array('attributes' => array('class' => array('views-more-link'))));
$suffix .= " " . $more_link;
}
diff --git a/core/modules/views/src/Plugin/views/field/Url.php b/core/modules/views/src/Plugin/views/field/Url.php
index b520aed..d67c53e 100644
--- a/core/modules/views/src/Plugin/views/field/Url.php
+++ b/core/modules/views/src/Plugin/views/field/Url.php
@@ -46,7 +46,9 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
public function render(ResultRow $values) {
$value = $this->getValue($values);
if (!empty($this->options['display_as_link'])) {
- return \Drupal::l($this->sanitizeValue($value), CoreUrl::fromUri('user-path:/' . $value), array('html' => TRUE));
+ // @todo Convert Views to expect a leading slash in path configurations.
+ // Needs followup issue.
+ return \Drupal::l($this->sanitizeValue($value), CoreUrl::fromUserInput('/' . $value), array('html' => TRUE));
}
else {
return $this->sanitizeValue($value, 'url');
diff --git a/core/modules/views/src/Plugin/views/row/RssFields.php b/core/modules/views/src/Plugin/views/row/RssFields.php
index 82b1212..10ed129 100644
--- a/core/modules/views/src/Plugin/views/row/RssFields.php
+++ b/core/modules/views/src/Plugin/views/row/RssFields.php
@@ -144,7 +144,9 @@ public function render($row) {
// Create the RSS item object.
$item = new \stdClass();
$item->title = $this->getField($row_index, $this->options['title_field']);
- $item->link = Url::fromUri('user-path:/' . $this->getField($row_index, $this->options['link_field']))->setAbsolute()->toString();
+ // @todo Is this actually user input? If so, Views should expect a leading
+ // slash (followup).
+ $item->link = Url::fromUserInput('/' . $this->getField($row_index, $this->options['link_field']))->setAbsolute()->toString();
$item->description = $this->getField($row_index, $this->options['description_field']);
$item->elements = array(
array('key' => 'pubDate', 'value' => $this->getField($row_index, $this->options['date_field'])),
@@ -158,7 +160,9 @@ public function render($row) {
$item_guid = $this->getField($row_index, $this->options['guid_field_options']['guid_field']);
if ($this->options['guid_field_options']['guid_field_is_permalink']) {
$guid_is_permalink_string = 'true';
- $item_guid = Url::fromUri('user-path:/' . $item_guid)->setAbsolute()->toString();
+ // @todo Is this actually user input? If so, Views should expect a leading
+ // slash (followup).
+ $item_guid = Url::fromUserInput('/' . $item_guid)->setAbsolute()->toString();
}
$item->elements[] = array(
'key' => 'guid',
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index dca6e3c..8e7af8d 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -336,7 +336,8 @@ function template_preprocess_views_view_summary(&$variables) {
$base_path = $argument->options['summary_options']['base_path'];
$tokens = $this->getArgumentsTokens();
$base_path = $this->viewsTokenReplace($base_path, $tokens);
- $url = Url::fromUri('user-path:/' . $base_path);
+ // @todo Views should expect a leading /. Needs followup issue.
+ $url = Url::fromUserInput('/' . $base_path);
}
else {
$url = $view->getUrl($args)->setOptions($url_options);
@@ -405,7 +406,7 @@ function template_preprocess_views_view_summary_unformatted(&$variables) {
$base_path = $argument->options['summary_options']['base_path'];
$tokens = $this->getArgumentsTokens();
$base_path = $this->viewsTokenReplace($base_path, $tokens);
- $url = Url::fromUri('user-path:/' . $base_path);
+ $url = Url::fromUserInput('/' . $base_path);
}
else {
$url = $view->getUrl($args)->setOptions($url_options);
@@ -914,8 +915,12 @@ function template_preprocess_views_view_rss(&$variables) {
// Compare the link to the default home page; if it's the default home page,
// just use $base_url.
+ // $todo The above comment seems out of date; also, this seems way messy.
+ // Views should expect a leadig slash, but why are we doing our own
+ // reverse-engineering for the front page route? And is this really user
+ // input?
$url_string = $url->setOptions($url_options)->toString();
- if ($url_string === Url::fromUri('user-path:/' . $config->get('page.front'))->toString()) {
+ if ($url_string === Url::fromUserInput('/' . $config->get('page.front'))->toString()) {
$url_string = Url::fromRoute('')->setAbsolute()->toString();
}
diff --git a/core/modules/views_ui/src/ViewListBuilder.php b/core/modules/views_ui/src/ViewListBuilder.php
index 04a9e9a..6a783b8 100644
--- a/core/modules/views_ui/src/ViewListBuilder.php
+++ b/core/modules/views_ui/src/ViewListBuilder.php
@@ -264,7 +264,9 @@ protected function getDisplayPaths(EntityInterface $view) {
if ($display->hasPath()) {
$path = $display->getPath();
if ($view->status() && strpos($path, '%') === FALSE) {
- $all_paths[] = \Drupal::l('/' . $path, Url::fromUri('user-path:/' . $path));
+ // @todo Convert Views to expect leading slashes in path
+ // configurations. Needs followup issue.
+ $all_paths[] = \Drupal::l('/' . $path, Url::fromUserInput('/' . $path));
}
else {
$all_paths[] = String::checkPlain('/' . $path);
diff --git a/core/modules/views_ui/src/ViewUI.php b/core/modules/views_ui/src/ViewUI.php
index 08e887c..f42c219 100644
--- a/core/modules/views_ui/src/ViewUI.php
+++ b/core/modules/views_ui/src/ViewUI.php
@@ -723,7 +723,9 @@ public function renderPreview($display_id, $args = array()) {
Xss::filterAdmin($this->executable->getTitle()),
);
if (isset($path)) {
- $path = \Drupal::l($path, Url::fromUri('user-path:/' . $path));
+ // @todo Convert Views to expect a leading slash in all path
+ // configurations. Needs followup issue.
+ $path = \Drupal::l($path, Url::fromUserInput('/' . $path));
}
else {
$path = t('This display has no path.');
diff --git a/core/profiles/standard/standard.install b/core/profiles/standard/standard.install
index f9466ff..4f51f8a 100644
--- a/core/profiles/standard/standard.install
+++ b/core/profiles/standard/standard.install
@@ -58,7 +58,7 @@ function standard_install() {
'shortcut_set' => 'default',
'title' => t('Add content'),
'weight' => -20,
- 'link' => array('uri' => 'user-path:/node/add'),
+ 'link' => array('uri' => 'internal:/node/add'),
));
$shortcut->save();
@@ -66,7 +66,7 @@ function standard_install() {
'shortcut_set' => 'default',
'title' => t('All content'),
'weight' => -19,
- 'link' => array('uri' => 'user-path:/admin/content'),
+ 'link' => array('uri' => 'internal:/admin/content'),
));
$shortcut->save();
diff --git a/core/tests/Drupal/Tests/Core/UrlTest.php b/core/tests/Drupal/Tests/Core/UrlTest.php
index 4096e3d..56ea66f 100644
--- a/core/tests/Drupal/Tests/Core/UrlTest.php
+++ b/core/tests/Drupal/Tests/Core/UrlTest.php
@@ -171,6 +171,79 @@ public function testFromRouteFront() {
}
/**
+ * Tests the fromUserInput method with valid paths.
+ *
+ * @covers ::fromUserInput
+ * @dataProvider providerFromUserInput
+ */
+ public function testFromUserInput($path) {
+ $url = Url::fromUserInput($path);
+
+ $this->assertInstanceOf('Drupal\Core\Url', $url);
+ }
+
+ /**
+ * Data provider for testFromValidUserInput().
+ */
+ public function providerFromUserInput() {
+ return [
+ // Normal paths with a leading slash.
+ ['/foo'],
+ ['/f/oo'],
+ // Fragments with and without leading slashes.
+ ['#foo'],
+ ['/#foo'],
+ ['/f#oo'],
+ // Query strings with and without leading slashes.
+ ['?foo'],
+ ['/?foo'],
+ ['/f?oo'],
+ // Paths with various token formats and leading slashes.
+ ['/[foo]'],
+ ['/%foo'],
+ ['/{{ foo }}'],
+ // Disallowed characters in the authority (host name) that are valid
+ // elsewhere in the path, with leading slashes.
+ ['/(:;2&+h^'],
+ ['/AKI@&hO@'],
+ ];
+ }
+
+ /**
+ * Tests the fromUserInput method with invalid paths.
+ *
+ * @covers ::fromUserInput
+ * @expectedException \InvalidArgumentException
+ * @dataProvider providerFromInvalidUserInput
+ */
+ public function testFromInvalidUserInput($path) {
+ $url = Url::fromUserInput($path);
+ }
+
+ /**
+ * Data provider for testFromInvalidUserInput().
+ */
+ public function providerFromInvalidUserInput() {
+ return [
+ // Normal paths without a leading slash.
+ ['foo'],
+ ['f/oo'],
+ // Path without a leading slash containing a fragment.
+ ['f#oo'],
+ // Path without a leading slash containing a query string.
+ ['f?oo'],
+ // Paths with various token formats but no leading slash.
+ ['[foo]'],
+ ['%foo'],
+ ['{{ foo }}'],
+ // Disallowed characters in the authority (host name) that are valid
+ // elsewhere in the path.
+ ['(:;2&+h^'],
+ ['AKI@&hO@'],
+ ];
+ }
+
+ /**
* Tests fromUri() method with a user-entered path not matching any route.
*
* @covers ::fromUri
@@ -180,7 +253,7 @@ public function testFromRoutedPathWithInvalidRoute() {
->method('getUrlIfValidWithoutAccessCheck')
->with('invalid-path')
->willReturn(FALSE);
- $url = Url::fromUri('user-path:/invalid-path');
+ $url = Url::fromUri('internal:/invalid-path');
$this->assertSame(FALSE, $url->isRouted());
$this->assertSame('base:invalid-path', $url->getUri());
}
@@ -196,7 +269,7 @@ public function testFromRoutedPathWithValidRoute() {
->method('getUrlIfValidWithoutAccessCheck')
->with('valid-path')
->willReturn($url);
- $result_url = Url::fromUri('user-path:/valid-path');
+ $result_url = Url::fromUri('internal:/valid-path');
$this->assertSame($url, $result_url);
}
@@ -592,13 +665,13 @@ public function providerTestToUriStringForEntity() {
}
/**
- * Tests the toUriString() method with user-path: URIs.
+ * Tests the toUriString() method with internal: URIs.
*
* @covers ::toUriString
*
- * @dataProvider providerTestToUriStringForUserPath
+ * @dataProvider providerTestToUriStringForInternalScheme
*/
- public function testToUriStringForUserPath($uri, $options, $uri_string) {
+ public function testToUriStringForInternalScheme($uri, $options, $uri_string) {
$url = Url::fromRoute('entity.test_entity.canonical', ['test_entity' => '1']);
$this->pathValidator->expects($this->any())
->method('getUrlIfValidWithoutAccessCheck')
@@ -612,27 +685,27 @@ public function testToUriStringForUserPath($uri, $options, $uri_string) {
}
/**
- * Data provider for testing user-path URIs
+ * Data provider for testing internal URIs.
*/
- public function providerTestToUriStringForUserPath() {
+ public function providerTestToUriStringForInternalScheme() {
return [
// The four permutations of a regular path.
- ['user-path:/test-entity/1', [], 'route:entity.test_entity.canonical;test_entity=1'],
- ['user-path:/test-entity/1', ['fragment' => 'top'], 'route:entity.test_entity.canonical;test_entity=1#top'],
- ['user-path:/test-entity/1', ['fragment' => 'top', 'query' => ['page' => '2']], 'route:entity.test_entity.canonical;test_entity=1?page=2#top'],
- ['user-path:/test-entity/1?page=2#top', [], 'route:entity.test_entity.canonical;test_entity=1?page=2#top'],
+ ['internal:/test-entity/1', [], 'route:entity.test_entity.canonical;test_entity=1'],
+ ['internal:/test-entity/1', ['fragment' => 'top'], 'route:entity.test_entity.canonical;test_entity=1#top'],
+ ['internal:/test-entity/1', ['fragment' => 'top', 'query' => ['page' => '2']], 'route:entity.test_entity.canonical;test_entity=1?page=2#top'],
+ ['internal:/test-entity/1?page=2#top', [], 'route:entity.test_entity.canonical;test_entity=1?page=2#top'],
// The four permutations of the special '' path.
- ['user-path:/', [], 'route:'],
- ['user-path:/', ['fragment' => 'top'], 'route:#top'],
- ['user-path:/', ['fragment' => 'top', 'query' => ['page' => '2']], 'route:?page=2#top'],
- ['user-path:/?page=2#top', [], 'route:?page=2#top'],
+ ['internal:/', [], 'route:'],
+ ['internal:/', ['fragment' => 'top'], 'route:#top'],
+ ['internal:/', ['fragment' => 'top', 'query' => ['page' => '2']], 'route:?page=2#top'],
+ ['internal:/?page=2#top', [], 'route:?page=2#top'],
// The four permutations of the special '' path.
- ['user-path:', [], 'route:'],
- ['user-path:', ['fragment' => 'top'], 'route:#top'],
- ['user-path:', ['fragment' => 'top', 'query' => ['page' => '2']], 'route:?page=2#top'],
- ['user-path:?page=2#top', [], 'route:?page=2#top'],
+ ['internal:', [], 'route:'],
+ ['internal:', ['fragment' => 'top'], 'route:#top'],
+ ['internal:', ['fragment' => 'top', 'query' => ['page' => '2']], 'route:?page=2#top'],
+ ['internal:?page=2#top', [], 'route:?page=2#top'],
];
}
@@ -649,7 +722,7 @@ public function testToUriStringForRoute($uri, $options, $uri_string) {
}
/**
- * Data provider for testing user-path URIs
+ * Data provider for testing routed URIs.
*/
public function providerTestToUriStringForRoute() {
return [
diff --git a/core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php b/core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php
index e12189f..0e90672 100644
--- a/core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php
+++ b/core/tests/Drupal/Tests/Core/Validation/Plugin/Validation/Constraint/PrimitiveTypeConstraintValidatorTest.php
@@ -73,7 +73,7 @@ public function provideTestValidate() {
$data[] = [$this->getMock('Drupal\Core\TypedData\Type\UriInterface'), 'entity:node/1', TRUE];
$data[] = [$this->getMock('Drupal\Core\TypedData\Type\UriInterface'), 'base:', TRUE];
$data[] = [$this->getMock('Drupal\Core\TypedData\Type\UriInterface'), 'base:node', TRUE];
- $data[] = [$this->getMock('Drupal\Core\TypedData\Type\UriInterface'), 'user-path:', TRUE];
+ $data[] = [$this->getMock('Drupal\Core\TypedData\Type\UriInterface'), 'internal:', TRUE];
$data[] = [$this->getMock('Drupal\Core\TypedData\Type\UriInterface'), 'public://', FALSE];
$data[] = [$this->getMock('Drupal\Core\TypedData\Type\UriInterface'), 'public://foo.png', TRUE];
$data[] = [$this->getMock('Drupal\Core\TypedData\Type\UriInterface'), 'private://', FALSE];