Update core 8.3.0

web/core/modules/path/tests/src/Functional/PathAdminTest.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace Drupal\Tests\path\Functional;
+
+/**
+ * Tests the Path admin UI.
+ *
+ * @group path
+ */
+class PathAdminTest extends PathTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['path'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create test user and log in.
+    $web_user = $this->drupalCreateUser(['create page content', 'edit own page content', 'administer url aliases', 'create url aliases']);
+    $this->drupalLogin($web_user);
+  }
+
+  /**
+   * Tests the filtering aspect of the Path UI.
+   */
+  public function testPathFiltering() {
+    // Create test nodes.
+    $node1 = $this->drupalCreateNode();
+    $node2 = $this->drupalCreateNode();
+    $node3 = $this->drupalCreateNode();
+
+    // Create aliases.
+    $alias1 = '/' . $this->randomMachineName(8);
+    $edit = [
+      'source' => '/node/' . $node1->id(),
+      'alias' => $alias1,
+    ];
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    $alias2 = '/' . $this->randomMachineName(8);
+    $edit = [
+      'source' => '/node/' . $node2->id(),
+      'alias' => $alias2,
+    ];
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    $alias3 = '/' . $this->randomMachineName(4) . '/' . $this->randomMachineName(4);
+    $edit = [
+      'source' => '/node/' . $node3->id(),
+      'alias' => $alias3,
+    ];
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    // Filter by the first alias.
+    $edit = [
+      'filter' => $alias1,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Filter'));
+    $this->assertLinkByHref($alias1);
+    $this->assertNoLinkByHref($alias2);
+    $this->assertNoLinkByHref($alias3);
+
+    // Filter by the second alias.
+    $edit = [
+      'filter' => $alias2,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Filter'));
+    $this->assertNoLinkByHref($alias1);
+    $this->assertLinkByHref($alias2);
+    $this->assertNoLinkByHref($alias3);
+
+    // Filter by the third alias which has a slash.
+    $edit = [
+      'filter' => $alias3,
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Filter'));
+    $this->assertNoLinkByHref($alias1);
+    $this->assertNoLinkByHref($alias2);
+    $this->assertLinkByHref($alias3);
+
+    // Filter by a random string with a different length.
+    $edit = [
+      'filter' => $this->randomMachineName(10),
+    ];
+    $this->drupalPostForm(NULL, $edit, t('Filter'));
+    $this->assertNoLinkByHref($alias1);
+    $this->assertNoLinkByHref($alias2);
+
+    // Reset the filter.
+    $edit = [];
+    $this->drupalPostForm(NULL, $edit, t('Reset'));
+    $this->assertLinkByHref($alias1);
+    $this->assertLinkByHref($alias2);
+  }
+
+}

web/core/modules/path/tests/src/Functional/PathAliasTest.php

@@ -0,0 +1,361 @@
+<?php
+
+namespace Drupal\Tests\path\Functional;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Database\Database;
+
+/**
+ * Add, edit, delete, and change alias and verify its consistency in the
+ * database.
+ *
+ * @group path
+ */
+class PathAliasTest extends PathTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['path'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create test user and log in.
+    $web_user = $this->drupalCreateUser(['create page content', 'edit own page content', 'administer url aliases', 'create url aliases']);
+    $this->drupalLogin($web_user);
+  }
+
+  /**
+   * Tests the path cache.
+   */
+  public function testPathCache() {
+    // Create test node.
+    $node1 = $this->drupalCreateNode();
+
+    // Create alias.
+    $edit = [];
+    $edit['source'] = '/node/' . $node1->id();
+    $edit['alias'] = '/' . $this->randomMachineName(8);
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    // Check the path alias whitelist cache.
+    $whitelist = \Drupal::cache('bootstrap')->get('path_alias_whitelist');
+    $this->assertTrue($whitelist->data['node']);
+    $this->assertFalse($whitelist->data['admin']);
+
+    // Visit the system path for the node and confirm a cache entry is
+    // created.
+    \Drupal::cache('data')->deleteAll();
+    // Make sure the path is not converted to the alias.
+    $this->drupalGet(trim($edit['source'], '/'), ['alias' => TRUE]);
+    $this->assertTrue(\Drupal::cache('data')->get('preload-paths:' . $edit['source']), 'Cache entry was created.');
+
+    // Visit the alias for the node and confirm a cache entry is created.
+    \Drupal::cache('data')->deleteAll();
+    // @todo Remove this once https://www.drupal.org/node/2480077 lands.
+    Cache::invalidateTags(['rendered']);
+    $this->drupalGet(trim($edit['alias'], '/'));
+    $this->assertTrue(\Drupal::cache('data')->get('preload-paths:' . $edit['source']), 'Cache entry was created.');
+  }
+
+  /**
+   * Tests alias functionality through the admin interfaces.
+   */
+  public function testAdminAlias() {
+    // Create test node.
+    $node1 = $this->drupalCreateNode();
+
+    // Create alias.
+    $edit = [];
+    $edit['source'] = '/node/' . $node1->id();
+    $edit['alias'] = '/' . $this->getRandomGenerator()->word(8);
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    // Confirm that the alias works.
+    $this->drupalGet($edit['alias']);
+    $this->assertText($node1->label(), 'Alias works.');
+    $this->assertResponse(200);
+    // Confirm that the alias works in a case-insensitive way.
+    $this->assertTrue(ctype_lower(ltrim($edit['alias'], '/')));
+    $this->drupalGet($edit['alias']);
+    $this->assertText($node1->label(), 'Alias works lower case.');
+    $this->assertResponse(200);
+    $this->drupalGet(Unicode::strtoupper($edit['alias']));
+    $this->assertText($node1->label(), 'Alias works upper case.');
+    $this->assertResponse(200);
+
+    // Change alias to one containing "exotic" characters.
+    $pid = $this->getPID($edit['alias']);
+
+    $previous = $edit['alias'];
+    $edit['alias'] = '/alias' . // Lower-case letters.
+      // "Special" ASCII characters.
+      "- ._~!$'\"()*@[]?&+%#,;=:" .
+      // Characters that look like a percent-escaped string.
+      "%23%25%26%2B%2F%3F" .
+      // Characters from various non-ASCII alphabets.
+      "中國書۞";
+    $connection = Database::getConnection();
+    if ($connection->databaseType() != 'sqlite') {
+      // When using LIKE for case-insensitivity, the SQLite driver is
+      // currently unable to find the upper-case versions of non-ASCII
+      // characters.
+      // @todo fix this in https://www.drupal.org/node/2607432
+      $edit['alias'] .= "ïвβéø";
+    }
+    $this->drupalPostForm('admin/config/search/path/edit/' . $pid, $edit, t('Save'));
+
+    // Confirm that the alias works.
+    $this->drupalGet(Unicode::strtoupper($edit['alias']));
+    $this->assertText($node1->label(), 'Changed alias works.');
+    $this->assertResponse(200);
+
+    $this->container->get('path.alias_manager')->cacheClear();
+    // Confirm that previous alias no longer works.
+    $this->drupalGet($previous);
+    $this->assertNoText($node1->label(), 'Previous alias no longer works.');
+    $this->assertResponse(404);
+
+    // Create second test node.
+    $node2 = $this->drupalCreateNode();
+
+    // Set alias to second test node.
+    $edit['source'] = '/node/' . $node2->id();
+    // leave $edit['alias'] the same
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    // Confirm no duplicate was created.
+    $this->assertRaw(t('The alias %alias is already in use in this language.', ['%alias' => $edit['alias']]), 'Attempt to move alias was rejected.');
+
+    $edit_upper = $edit;
+    $edit_upper['alias'] = Unicode::strtoupper($edit['alias']);
+    $this->drupalPostForm('admin/config/search/path/add', $edit_upper, t('Save'));
+    $this->assertRaw(t('The alias %alias could not be added because it is already in use in this language with different capitalization: %stored_alias.', [
+      '%alias' => $edit_upper['alias'],
+      '%stored_alias' => $edit['alias'],
+    ]), 'Attempt to move upper-case alias was rejected.');
+
+    // Delete alias.
+    $this->drupalGet('admin/config/search/path/edit/' . $pid);
+    $this->clickLink(t('Delete'));
+    $this->assertRaw(t('Are you sure you want to delete path alias %name?', ['%name' => $edit['alias']]));
+    $this->drupalPostForm(NULL, [], t('Confirm'));
+
+    // Confirm that the alias no longer works.
+    $this->drupalGet($edit['alias']);
+    $this->assertNoText($node1->label(), 'Alias was successfully deleted.');
+    $this->assertResponse(404);
+
+    // Create a really long alias.
+    $edit = [];
+    $edit['source'] = '/node/' . $node1->id();
+    $alias = '/' . $this->randomMachineName(128);
+    $edit['alias'] = $alias;
+    // The alias is shortened to 50 characters counting the ellipsis.
+    $truncated_alias = substr($alias, 0, 47);
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+    $this->assertNoText($alias, 'The untruncated alias was not found.');
+    // The 'truncated' alias will always be found.
+    $this->assertText($truncated_alias, 'The truncated alias was found.');
+
+    // Create third test node.
+    $node3 = $this->drupalCreateNode();
+
+    // Create absolute path alias.
+    $edit = [];
+    $edit['source'] = '/node/' . $node3->id();
+    $node3_alias = '/' . $this->randomMachineName(8);
+    $edit['alias'] = $node3_alias;
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    // Create fourth test node.
+    $node4 = $this->drupalCreateNode();
+
+    // Create alias with trailing slash.
+    $edit = [];
+    $edit['source'] = '/node/' . $node4->id();
+    $node4_alias = '/' . $this->randomMachineName(8);
+    $edit['alias'] = $node4_alias . '/';
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    // Confirm that the alias with trailing slash is not found.
+    $this->assertNoText($edit['alias'], 'The absolute alias was not found.');
+    // The alias without trailing flash is found.
+    $this->assertText(trim($edit['alias'], '/'), 'The alias without trailing slash was found.');
+
+    // Update an existing alias to point to a different source.
+    $pid = $this->getPID($node4_alias);
+    $edit = [];
+    $edit['alias'] = $node4_alias;
+    $edit['source'] = '/node/' . $node2->id();
+    $this->drupalPostForm('admin/config/search/path/edit/' . $pid, $edit, t('Save'));
+    $this->assertText('The alias has been saved.');
+    $this->drupalGet($edit['alias']);
+    $this->assertNoText($node4->label(), 'Previous alias no longer works.');
+    $this->assertText($node2->label(), 'Alias works.');
+    $this->assertResponse(200);
+
+    // Update an existing alias to use a duplicate alias.
+    $pid = $this->getPID($node3_alias);
+    $edit = [];
+    $edit['alias'] = $node4_alias;
+    $edit['source'] = '/node/' . $node3->id();
+    $this->drupalPostForm('admin/config/search/path/edit/' . $pid, $edit, t('Save'));
+    $this->assertRaw(t('The alias %alias is already in use in this language.', ['%alias' => $edit['alias']]));
+
+    // Create an alias without a starting slash.
+    $node5 = $this->drupalCreateNode();
+
+    $edit = [];
+    $edit['source'] = 'node/' . $node5->id();
+    $node5_alias = $this->randomMachineName(8);
+    $edit['alias'] = $node5_alias . '/';
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    $this->assertUrl('admin/config/search/path/add');
+    $this->assertText('The source path has to start with a slash.');
+    $this->assertText('The alias path has to start with a slash.');
+  }
+
+  /**
+   * Tests alias functionality through the node interfaces.
+   */
+  public function testNodeAlias() {
+    // Create test node.
+    $node1 = $this->drupalCreateNode();
+
+    // Create alias.
+    $edit = [];
+    $edit['path[0][alias]'] = '/' . $this->randomMachineName(8);
+    $this->drupalPostForm('node/' . $node1->id() . '/edit', $edit, t('Save'));
+
+    // Confirm that the alias works.
+    $this->drupalGet($edit['path[0][alias]']);
+    $this->assertText($node1->label(), 'Alias works.');
+    $this->assertResponse(200);
+
+    // Confirm the 'canonical' and 'shortlink' URLs.
+    $elements = $this->xpath("//link[contains(@rel, 'canonical') and contains(@href, '" . $edit['path[0][alias]'] . "')]");
+    $this->assertTrue(!empty($elements), 'Page contains canonical link URL.');
+    $elements = $this->xpath("//link[contains(@rel, 'shortlink') and contains(@href, 'node/" . $node1->id() . "')]");
+    $this->assertTrue(!empty($elements), 'Page contains shortlink URL.');
+
+    $previous = $edit['path[0][alias]'];
+    // Change alias to one containing "exotic" characters.
+    $edit['path[0][alias]'] = '/alias' . // Lower-case letters.
+      // "Special" ASCII characters.
+      "- ._~!$'\"()*@[]?&+%#,;=:" .
+      // Characters that look like a percent-escaped string.
+      "%23%25%26%2B%2F%3F" .
+      // Characters from various non-ASCII alphabets.
+      "中國書۞";
+    $connection = Database::getConnection();
+    if ($connection->databaseType() != 'sqlite') {
+      // When using LIKE for case-insensitivity, the SQLite driver is
+      // currently unable to find the upper-case versions of non-ASCII
+      // characters.
+      // @todo fix this in https://www.drupal.org/node/2607432
+      $edit['path[0][alias]'] .= "ïвβéø";
+    }
+    $this->drupalPostForm('node/' . $node1->id() . '/edit', $edit, t('Save'));
+
+    // Confirm that the alias works.
+    $this->drupalGet(Unicode::strtoupper($edit['path[0][alias]']));
+    $this->assertText($node1->label(), 'Changed alias works.');
+    $this->assertResponse(200);
+
+    // Make sure that previous alias no longer works.
+    $this->drupalGet($previous);
+    $this->assertNoText($node1->label(), 'Previous alias no longer works.');
+    $this->assertResponse(404);
+
+    // Create second test node.
+    $node2 = $this->drupalCreateNode();
+
+    // Set alias to second test node.
+    // Leave $edit['path[0][alias]'] the same.
+    $this->drupalPostForm('node/' . $node2->id() . '/edit', $edit, t('Save'));
+
+    // Confirm that the alias didn't make a duplicate.
+    $this->assertText(t('The alias is already in use.'), 'Attempt to moved alias was rejected.');
+
+    // Delete alias.
+    $this->drupalPostForm('node/' . $node1->id() . '/edit', ['path[0][alias]' => ''], t('Save'));
+
+    // Confirm that the alias no longer works.
+    $this->drupalGet($edit['path[0][alias]']);
+    $this->assertNoText($node1->label(), 'Alias was successfully deleted.');
+    $this->assertResponse(404);
+
+    // Create third test node.
+    $node3 = $this->drupalCreateNode();
+
+    // Set its path alias to an absolute path.
+    $edit = ['path[0][alias]' => '/' . $this->randomMachineName(8)];
+    $this->drupalPostForm('node/' . $node3->id() . '/edit', $edit, t('Save'));
+
+    // Confirm that the alias was converted to a relative path.
+    $this->drupalGet(trim($edit['path[0][alias]'], '/'));
+    $this->assertText($node3->label(), 'Alias became relative.');
+    $this->assertResponse(200);
+
+    // Create fourth test node.
+    $node4 = $this->drupalCreateNode();
+
+    // Set its path alias to have a trailing slash.
+    $edit = ['path[0][alias]' => '/' . $this->randomMachineName(8) . '/'];
+    $this->drupalPostForm('node/' . $node4->id() . '/edit', $edit, t('Save'));
+
+    // Confirm that the alias was converted to a relative path.
+    $this->drupalGet(trim($edit['path[0][alias]'], '/'));
+    $this->assertText($node4->label(), 'Alias trimmed trailing slash.');
+    $this->assertResponse(200);
+
+    // Create fifth test node.
+    $node5 = $this->drupalCreateNode();
+
+    // Set a path alias.
+    $edit = ['path[0][alias]' => '/' . $this->randomMachineName(8)];
+    $this->drupalPostForm('node/' . $node5->id() . '/edit', $edit, t('Save'));
+
+    // Delete the node and check that the path alias is also deleted.
+    $node5->delete();
+    $path_alias = \Drupal::service('path.alias_storage')->lookupPathAlias('/node/' . $node5->id(), $node5->language()->getId());
+    $this->assertFalse($path_alias, 'Alias was successfully deleted when the referenced node was deleted.');
+  }
+
+  /**
+   * Returns the path ID.
+   *
+   * @param string $alias
+   *   A string containing an aliased path.
+   *
+   * @return int
+   *   Integer representing the path ID.
+   */
+  public function getPID($alias) {
+    return db_query("SELECT pid FROM {url_alias} WHERE alias = :alias", [':alias' => $alias])->fetchField();
+  }
+
+  /**
+   * Tests that duplicate aliases fail validation.
+   */
+  public function testDuplicateNodeAlias() {
+    // Create one node with a random alias.
+    $node_one = $this->drupalCreateNode();
+    $edit = [];
+    $edit['path[0][alias]'] = '/' . $this->randomMachineName();
+    $this->drupalPostForm('node/' . $node_one->id() . '/edit', $edit, t('Save'));
+
+    // Now create another node and try to set the same alias.
+    $node_two = $this->drupalCreateNode();
+    $this->drupalPostForm('node/' . $node_two->id() . '/edit', $edit, t('Save'));
+    $this->assertText(t('The alias is already in use.'));
+    $this->assertFieldByXPath("//input[@name='path[0][alias]' and contains(@class, 'error')]", $edit['path[0][alias]'], 'Textfield exists and has the error class.');
+  }
+
+}

web/core/modules/path/tests/src/Functional/PathLanguageTest.php

@@ -0,0 +1,196 @@
+<?php
+
+namespace Drupal\Tests\path\Functional;
+
+/**
+ * Confirm that paths work with translated nodes.
+ *
+ * @group path
+ */
+class PathLanguageTest extends PathTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['path', 'locale', 'locale_test', 'content_translation'];
+
+  /**
+   * An user with permissions to administer content types.
+   *
+   * @var \Drupal\user\UserInterface
+   */
+  protected $webUser;
+
+  protected function setUp() {
+    parent::setUp();
+
+    $permissions = [
+      'access administration pages',
+      'administer content translation',
+      'administer content types',
+      'administer languages',
+      'administer url aliases',
+      'create content translations',
+      'create page content',
+      'create url aliases',
+      'edit any page content',
+      'translate any entity',
+    ];
+    // Create and log in user.
+    $this->webUser = $this->drupalCreateUser($permissions);
+    $this->drupalLogin($this->webUser);
+
+    // Enable French language.
+    $edit = [];
+    $edit['predefined_langcode'] = 'fr';
+
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Enable URL language detection and selection.
+    $edit = ['language_interface[enabled][language-url]' => 1];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Enable translation for page node.
+    $edit = [
+      'entity_types[node]' => 1,
+      'settings[node][page][translatable]' => 1,
+      'settings[node][page][fields][path]' => 1,
+      'settings[node][page][fields][body]' => 1,
+      'settings[node][page][settings][language][language_alterable]' => 1,
+    ];
+    $this->drupalPostForm('admin/config/regional/content-language', $edit, t('Save configuration'));
+    \Drupal::entityManager()->clearCachedDefinitions();
+
+    $definitions = \Drupal::entityManager()->getFieldDefinitions('node', 'page');
+    $this->assertTrue($definitions['path']->isTranslatable(), 'Node path is translatable.');
+    $this->assertTrue($definitions['body']->isTranslatable(), 'Node body is translatable.');
+  }
+
+  /**
+   * Test alias functionality through the admin interfaces.
+   */
+  public function testAliasTranslation() {
+    $node_storage = $this->container->get('entity.manager')->getStorage('node');
+    $english_node = $this->drupalCreateNode(['type' => 'page', 'langcode' => 'en']);
+    $english_alias = $this->randomMachineName();
+
+    // Edit the node to set language and path.
+    $edit = [];
+    $edit['path[0][alias]'] = '/' . $english_alias;
+    $this->drupalPostForm('node/' . $english_node->id() . '/edit', $edit, t('Save'));
+
+    // Confirm that the alias works.
+    $this->drupalGet($english_alias);
+    $this->assertText($english_node->body->value, 'Alias works.');
+
+    // Translate the node into French.
+    $this->drupalGet('node/' . $english_node->id() . '/translations');
+    $this->clickLink(t('Add'));
+
+    $edit = [];
+    $edit['title[0][value]'] = $this->randomMachineName();
+    $edit['body[0][value]'] = $this->randomMachineName();
+    $french_alias = $this->randomMachineName();
+    $edit['path[0][alias]'] = '/' . $french_alias;
+    $this->drupalPostForm(NULL, $edit, t('Save (this translation)'));
+
+    // Clear the path lookup cache.
+    $this->container->get('path.alias_manager')->cacheClear();
+
+    // Languages are cached on many levels, and we need to clear those caches.
+    $this->container->get('language_manager')->reset();
+    $this->rebuildContainer();
+    $languages = $this->container->get('language_manager')->getLanguages();
+
+    // Ensure the node was created.
+    $node_storage->resetCache([$english_node->id()]);
+    $english_node = $node_storage->load($english_node->id());
+    $english_node_french_translation = $english_node->getTranslation('fr');
+    $this->assertTrue($english_node->hasTranslation('fr'), 'Node found in database.');
+
+    // Confirm that the alias works.
+    $this->drupalGet('fr' . $edit['path[0][alias]']);
+    $this->assertText($english_node_french_translation->body->value, 'Alias for French translation works.');
+
+    // Confirm that the alias is returned for the URL. Languages are cached on
+    // many levels, and we need to clear those caches.
+    $this->container->get('language_manager')->reset();
+    $languages = $this->container->get('language_manager')->getLanguages();
+    $url = $english_node_french_translation->url('canonical', ['language' => $languages['fr']]);
+
+    $this->assertTrue(strpos($url, $edit['path[0][alias]']), 'URL contains the path alias.');
+
+    // Confirm that the alias works even when changing language negotiation
+    // options. Enable User language detection and selection over URL one.
+    $edit = [
+      'language_interface[enabled][language-user]' => 1,
+      'language_interface[weight][language-user]' => -9,
+      'language_interface[enabled][language-url]' => 1,
+      'language_interface[weight][language-url]' => -8,
+    ];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Change user language preference.
+    $edit = ['preferred_langcode' => 'fr'];
+    $this->drupalPostForm("user/" . $this->webUser->id() . "/edit", $edit, t('Save'));
+
+    // Check that the English alias works. In this situation French is the
+    // current UI and content language, while URL language is English (since we
+    // do not have a path prefix we fall back to the site's default language).
+    // We need to ensure that the user language preference is not taken into
+    // account while determining the path alias language, because if this
+    // happens we have no way to check that the path alias is valid: there is no
+    // path alias for French matching the english alias. So the alias manager
+    // needs to use the URL language to check whether the alias is valid.
+    $this->drupalGet($english_alias);
+    $this->assertText($english_node_french_translation->body->value, 'English alias, but French preferred by the user: French translation.');
+
+    // Check that the French alias works.
+    $this->drupalGet("fr/$french_alias");
+    $this->assertText($english_node_french_translation->body->value, 'Alias for French translation works.');
+
+    // Disable URL language negotiation.
+    $edit = ['language_interface[enabled][language-url]' => FALSE];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+
+    // Check that the English alias still works.
+    $this->drupalGet($english_alias);
+    $this->assertText($english_node_french_translation->body->value, 'English alias, but French preferred by the user: French translation.');
+
+    // Check that the French alias is not available. We check the unprefixed
+    // alias because we disabled URL language negotiation above. In this
+    // situation only aliases in the default language and language neutral ones
+    // should keep working.
+    $this->drupalGet($french_alias);
+    $this->assertResponse(404, 'Alias for French translation is unavailable when URL language negotiation is disabled.');
+
+    // The alias manager has an internal path lookup cache. Check to see that
+    // it has the appropriate contents at this point.
+    $this->container->get('path.alias_manager')->cacheClear();
+    $french_node_path = $this->container->get('path.alias_manager')->getPathByAlias('/' . $french_alias, 'fr');
+    $this->assertEqual($french_node_path, '/node/' . $english_node_french_translation->id(), 'Normal path works.');
+    // Second call should return the same path.
+    $french_node_path = $this->container->get('path.alias_manager')->getPathByAlias('/' . $french_alias, 'fr');
+    $this->assertEqual($french_node_path, '/node/' . $english_node_french_translation->id(), 'Normal path is the same.');
+
+    // Confirm that the alias works.
+    $french_node_alias = $this->container->get('path.alias_manager')->getAliasByPath('/node/' . $english_node_french_translation->id(), 'fr');
+    $this->assertEqual($french_node_alias, '/' . $french_alias, 'Alias works.');
+    // Second call should return the same alias.
+    $french_node_alias = $this->container->get('path.alias_manager')->getAliasByPath('/node/' . $english_node_french_translation->id(), 'fr');
+    $this->assertEqual($french_node_alias, '/' . $french_alias, 'Alias is the same.');
+
+    // Confirm that the alias is removed if the translation is deleted.
+    $english_node->removeTranslation('fr');
+    $english_node->save();
+    $this->assertFalse($this->container->get('path.alias_storage')->aliasExists('/' . $french_alias, 'fr'), 'Alias for French translation is removed when translation is deleted.');
+
+    // Check that the English alias still works.
+    $this->drupalGet($english_alias);
+    $this->assertTrue($this->container->get('path.alias_storage')->aliasExists('/' . $english_alias, 'en'), 'English alias is not deleted when French translation is removed.');
+    $this->assertText($english_node->body->value, 'English alias still works');
+  }
+
+}

web/core/modules/path/tests/src/Functional/PathLanguageUiTest.php

@@ -0,0 +1,81 @@
+<?php
+
+namespace Drupal\Tests\path\Functional;
+
+/**
+ * Confirm that the Path module user interface works with languages.
+ *
+ * @group path
+ */
+class PathLanguageUiTest extends PathTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['path', 'locale', 'locale_test'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create and log in user.
+    $web_user = $this->drupalCreateUser(['edit any page content', 'create page content', 'administer url aliases', 'create url aliases', 'administer languages', 'access administration pages']);
+    $this->drupalLogin($web_user);
+
+    // Enable French language.
+    $edit = [];
+    $edit['predefined_langcode'] = 'fr';
+
+    $this->drupalPostForm('admin/config/regional/language/add', $edit, t('Add language'));
+
+    // Enable URL language detection and selection.
+    $edit = ['language_interface[enabled][language-url]' => 1];
+    $this->drupalPostForm('admin/config/regional/language/detection', $edit, t('Save settings'));
+  }
+
+  /**
+   * Tests that a language-neutral URL alias works.
+   */
+  public function testLanguageNeutralUrl() {
+    $name = $this->randomMachineName(8);
+    $edit = [];
+    $edit['source'] = '/admin/config/search/path';
+    $edit['alias'] = '/' . $name;
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    $this->drupalGet($name);
+    $this->assertText(t('Filter aliases'), 'Language-neutral URL alias works');
+  }
+
+  /**
+   * Tests that a default language URL alias works.
+   */
+  public function testDefaultLanguageUrl() {
+    $name = $this->randomMachineName(8);
+    $edit = [];
+    $edit['source'] = '/admin/config/search/path';
+    $edit['alias'] = '/' . $name;
+    $edit['langcode'] = 'en';
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    $this->drupalGet($name);
+    $this->assertText(t('Filter aliases'), 'English URL alias works');
+  }
+
+  /**
+   * Tests that a non-default language URL alias works.
+   */
+  public function testNonDefaultUrl() {
+    $name = $this->randomMachineName(8);
+    $edit = [];
+    $edit['source'] = '/admin/config/search/path';
+    $edit['alias'] = '/' . $name;
+    $edit['langcode'] = 'fr';
+    $this->drupalPostForm('admin/config/search/path/add', $edit, t('Save'));
+
+    $this->drupalGet('fr/' . $name);
+    $this->assertText(t('Filter aliases'), 'Foreign URL alias works');
+  }
+
+}

web/core/modules/path/tests/src/Functional/PathNodeFormTest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Drupal\Tests\path\Functional;
+
+/**
+ * Tests the Path Node form UI.
+ *
+ * @group path
+ */
+class PathNodeFormTest extends PathTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'path'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create test user and log in.
+    $web_user = $this->drupalCreateUser(['create page content', 'create url aliases']);
+    $this->drupalLogin($web_user);
+  }
+
+  /**
+   * Tests the node form ui.
+   */
+  public function testNodeForm() {
+    $this->drupalGet('node/add/page');
+
+    // Make sure we have a Path fieldset and Path fields.
+    $this->assertRaw(' id="edit-path-settings"', 'Path settings details exists');
+    $this->assertFieldByName('path[0][alias]', NULL, 'Path alias field exists');
+
+    // Disable the Path field for this content type.
+    entity_get_form_display('node', 'page', 'default')
+      ->removeComponent('path')
+      ->save();
+
+    $this->drupalGet('node/add/page');
+
+    // See if the whole fieldset is gone now.
+    $this->assertNoRaw(' id="edit-path-settings"', 'Path settings details does not exist');
+    $this->assertNoFieldByName('path[0][alias]', NULL, 'Path alias field does not exist');
+  }
+
+}

web/core/modules/path/tests/src/Functional/PathTaxonomyTermTest.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace Drupal\Tests\path\Functional;
+
+use Drupal\taxonomy\Entity\Vocabulary;
+
+/**
+ * Tests URL aliases for taxonomy terms.
+ *
+ * @group path
+ */
+class PathTaxonomyTermTest extends PathTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['taxonomy'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create a Tags vocabulary for the Article node type.
+    $vocabulary = Vocabulary::create([
+      'name' => t('Tags'),
+      'vid' => 'tags',
+    ]);
+    $vocabulary->save();
+
+    // Create and log in user.
+    $web_user = $this->drupalCreateUser(['administer url aliases', 'administer taxonomy', 'access administration pages']);
+    $this->drupalLogin($web_user);
+  }
+
+  /**
+   * Tests alias functionality through the admin interfaces.
+   */
+  public function testTermAlias() {
+    // Create a term in the default 'Tags' vocabulary with URL alias.
+    $vocabulary = Vocabulary::load('tags');
+    $description = $this->randomMachineName();
+    $edit = [
+      'name[0][value]' => $this->randomMachineName(),
+      'description[0][value]' => $description,
+      'path[0][alias]' => '/' . $this->randomMachineName(),
+    ];
+    $this->drupalPostForm('admin/structure/taxonomy/manage/' . $vocabulary->id() . '/add', $edit, t('Save'));
+    $tid = db_query("SELECT tid FROM {taxonomy_term_field_data} WHERE name = :name AND default_langcode = 1", [':name' => $edit['name[0][value]']])->fetchField();
+
+    // Confirm that the alias works.
+    $this->drupalGet($edit['path[0][alias]']);
+    $this->assertText($description, 'Term can be accessed on URL alias.');
+
+    // Confirm the 'canonical' and 'shortlink' URLs.
+    $elements = $this->xpath("//link[contains(@rel, 'canonical') and contains(@href, '" . $edit['path[0][alias]'] . "')]");
+    $this->assertTrue(!empty($elements), 'Term page contains canonical link URL.');
+    $elements = $this->xpath("//link[contains(@rel, 'shortlink') and contains(@href, 'taxonomy/term/" . $tid . "')]");
+    $this->assertTrue(!empty($elements), 'Term page contains shortlink URL.');
+
+    // Change the term's URL alias.
+    $edit2 = [];
+    $edit2['path[0][alias]'] = '/' . $this->randomMachineName();
+    $this->drupalPostForm('taxonomy/term/' . $tid . '/edit', $edit2, t('Save'));
+
+    // Confirm that the changed alias works.
+    $this->drupalGet(trim($edit2['path[0][alias]'], '/'));
+    $this->assertText($description, 'Term can be accessed on changed URL alias.');
+
+    // Confirm that the old alias no longer works.
+    $this->drupalGet(trim($edit['path[0][alias]'], '/'));
+    $this->assertNoText($description, 'Old URL alias has been removed after altering.');
+    $this->assertResponse(404, 'Old URL alias returns 404.');
+
+    // Remove the term's URL alias.
+    $edit3 = [];
+    $edit3['path[0][alias]'] = '';
+    $this->drupalPostForm('taxonomy/term/' . $tid . '/edit', $edit3, t('Save'));
+
+    // Confirm that the alias no longer works.
+    $this->drupalGet(trim($edit2['path[0][alias]'], '/'));
+    $this->assertNoText($description, 'Old URL alias has been removed after altering.');
+    $this->assertResponse(404, 'Old URL alias returns 404.');
+  }
+
+}

web/core/modules/path/tests/src/Functional/PathTestBase.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Drupal\Tests\path\Functional;
+
+use Drupal\Tests\BrowserTestBase;
+
+/**
+ * Provides a base class for testing the Path module.
+ */
+abstract class PathTestBase extends BrowserTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'path'];
+
+  protected function setUp() {
+    parent::setUp();
+
+    // Create Basic page and Article node types.
+    if ($this->profile != 'standard') {
+      $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
+      $this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
+    }
+  }
+
+}

web/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php

@@ -61,46 +61,46 @@ class MigrateUrlAliasTest extends MigrateDrupal6TestBase {
   public function testUrlAlias() {
     $id_map = $this->getMigration('d6_url_alias')->getIdMap();
     // Test that the field exists.
-    $conditions = array(
+    $conditions = [
       'source' => '/node/1',
       'alias' => '/alias-one',
       'langcode' => 'af',
-    );
+    ];
     $path = \Drupal::service('path.alias_storage')->load($conditions);
     $this->assertPath('1', $conditions, $path);
-    $this->assertIdentical($id_map->lookupDestinationID(array($path['pid'])), array('1'), "Test IdMap");
+    $this->assertIdentical($id_map->lookupDestinationID([$path['pid']]), ['1'], "Test IdMap");
 
-    $conditions = array(
+    $conditions = [
       'source' => '/node/2',
       'alias' => '/alias-two',
       'langcode' => 'en',
-    );
+    ];
     $path = \Drupal::service('path.alias_storage')->load($conditions);
     $this->assertPath('2', $conditions, $path);
 
     // Test that we can re-import using the UrlAlias destination.
     Database::getConnection('default', 'migrate')
       ->update('url_alias')
-      ->fields(array('dst' => 'new-url-alias'))
+      ->fields(['dst' => 'new-url-alias'])
       ->condition('src', 'node/2')
       ->execute();
 
     \Drupal::database()
       ->update($id_map->mapTableName())
-      ->fields(array('source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE))
+      ->fields(['source_row_status' => MigrateIdMapInterface::STATUS_NEEDS_UPDATE])
       ->execute();
     $migration = $this->getMigration('d6_url_alias');
     $this->executeMigration($migration);
 
-    $path = \Drupal::service('path.alias_storage')->load(array('pid' => $path['pid']));
+    $path = \Drupal::service('path.alias_storage')->load(['pid' => $path['pid']]);
     $conditions['alias'] = '/new-url-alias';
     $this->assertPath('2', $conditions, $path);
 
-    $conditions = array(
+    $conditions = [
       'source' => '/node/3',
       'alias' => '/alias-three',
       'langcode' => 'und',
-    );
+    ];
     $path = \Drupal::service('path.alias_storage')->load($conditions);
     $this->assertPath('3', $conditions, $path);
   }

web/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php

@@ -14,14 +14,33 @@ class MigrateUrlAliasTest extends MigrateDrupal7TestBase {
   /**
    * {@inheritdoc}
    */
-  public static $modules = ['path'];
+  public static $modules = [
+    'content_translation',
+    'language',
+    'node',
+    'path',
+    'text',
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->executeMigration('d7_url_alias');
+
+    $this->installEntitySchema('node');
+    $this->installConfig('node');
+    $this->installSchema('node', ['node_access']);
+
+    $this->executeMigrations([
+      'language',
+      'd7_user_role',
+      'd7_user',
+      'd7_node_type',
+      'd7_node',
+      'd7_node_translation',
+      'd7_url_alias',
+    ]);
   }
 
   /**
@@ -38,4 +57,33 @@ class MigrateUrlAliasTest extends MigrateDrupal7TestBase {
     $this->assertIdentical('und', $path['langcode']);
   }
 
+  /**
+   * Test the URL alias migration with translated nodes.
+   */
+  public function testUrlAliasWithTranslatedNodes() {
+    $alias_storage = $this->container->get('path.alias_storage');
+
+    // Alias for the 'The thing about Deep Space 9' node in English.
+    $path = $alias_storage->load(['alias' => '/deep-space-9']);
+    $this->assertSame('/node/2', $path['source']);
+    $this->assertSame('en', $path['langcode']);
+
+    // Alias for the 'The thing about Deep Space 9' Icelandic translation,
+    // which should now point to node/2 instead of node/3.
+    $path = $alias_storage->load(['alias' => '/deep-space-9-is']);
+    $this->assertSame('/node/2', $path['source']);
+    $this->assertSame('is', $path['langcode']);
+
+    // Alias for the 'The thing about Firefly' node in Icelandic.
+    $path = $alias_storage->load(['alias' => '/firefly-is']);
+    $this->assertSame('/node/4', $path['source']);
+    $this->assertSame('is', $path['langcode']);
+
+    // Alias for the 'The thing about Firefly' English translation,
+    // which should now point to node/4 instead of node/5.
+    $path = $alias_storage->load(['alias' => '/firefly']);
+    $this->assertSame('/node/4', $path['source']);
+    $this->assertSame('en', $path['langcode']);
+  }
+
 }

web/core/modules/path/tests/src/Kernel/PathNoCanonicalLinkTest.php

@@ -18,7 +18,7 @@ class PathNoCanonicalLinkTest extends KernelTestBase {
    *
    * @var array
    */
-  public static $modules = array('path', 'content_translation_test', 'language', 'entity_test', 'user', 'system');
+  public static $modules = ['path', 'content_translation_test', 'language', 'entity_test', 'user', 'system'];
 
   protected function setUp() {
     parent::setUp();

web/core/modules/path/tests/src/Unit/Field/PathFieldDefinitionTest.php

@@ -21,7 +21,7 @@ class PathFieldDefinitionTest extends BaseFieldDefinitionTestBase {
    * {@inheritdoc}
    */
   protected function getModuleAndPath() {
-    return array('path', dirname(dirname(dirname(dirname(__DIR__)))));
+    return ['path', dirname(dirname(dirname(dirname(__DIR__))))];
   }
 
   /**
@@ -29,7 +29,7 @@ class PathFieldDefinitionTest extends BaseFieldDefinitionTestBase {
    * @covers ::getSchema
    */
   public function testGetColumns() {
-    $this->assertSame(array(), $this->definition->getColumns());
+    $this->assertSame([], $this->definition->getColumns());
   }
 
 }