Merge lookup functions in AliasManager

// Look for the alias within the cached map.
+    if (isset($this->lookupMap[$language]) && $path = array_search($alias, $this->lookupMap[$language])) {
+      return $path;
+    }

There should be () round the $path assignment

Need types

+   * @param $alias
+   *   An alias.
+   * @param $language

so

@param string etc.....also for return

Same for doxygen of

public function getAliasByPath($path, $language = NULL);

Over 80 characters

* Return value callback for the getAliasByPath() method on the mock alias manager

Same with

* Ensures that by default the call to getAliasByPath() will return the first argument
* that was passed in. We special-case the paths for which we wish it to return an

Looks good

looks good

Will these change records need updates?
https://drupal.org/node/1853148
https://drupal.org/node/2221879

If so, let's update them to add a reference to this issue so that they show up in the sidebar here, and change the method names appropriately once the issue is fixed.

@slashrsm, good idea.

Updating re-rolled patch.

+++ b/core/lib/Drupal/Core/Path/AliasManager.php
@@ -88,36 +88,87 @@ public function __construct(AliasStorageInterface $storage, AliasWhitelistInterf
+    // Check the path whitelist, if the top-level part before the first /

Shouldn't this happen before the pre-load of paths by language? Seems like it could avoid getting the cache entry at all in some situations.

The other changes look good.

Related is #2248897: Fix AliasManager and AliasManagerCacheDecorator, the better naming here might have avoided that bug.

Just a reminder that the change records linked in the sidebar will need updates when this goes in. Thanks!

Those changes look good, back to RTBC.

+++ b/core/lib/Drupal/Core/CacheDecorator/AliasManagerCacheDecorator.php
@@ -83,25 +83,25 @@ public function writeCache() {
-  public function getSystemPath($path, $path_language = NULL) {
-    $system_path = $this->aliasManager->getSystemPath($path, $path_language);
+  public function getPathByAlias($alias, $language = NULL) {
+    $path = $this->aliasManager->getPathByAlias($alias, $language);
...
-  public function getPathAlias($path, $path_language = NULL) {
-    return $this->aliasManager->getPathAlias($path, $path_language);
+  public function getAliasByPath($path, $language = NULL) {
+    return $this->aliasManager->getAliasByPath($path, $language);

+++ b/core/lib/Drupal/Core/Path/AliasManager.php
@@ -88,36 +88,87 @@ public function __construct(AliasStorageInterface $storage, AliasWhitelistInterf
-  public function getSystemPath($path, $path_language = NULL) {
+  public function getPathByAlias($alias, $language = NULL) {
     // If no language is explicitly specified we default to the current URL
     // language. If we used a language different from the one conveyed by the
     // requested URL, we might end up being unable to check if there is a path
     // alias matching the URL path.
-    $path_language = $path_language ?: $this->languageManager->getCurrentLanguage(Language::TYPE_URL)->id;
-    // Lookup the path alias first.
-    if (!empty($path) && $source = $this->lookupPathSource($path, $path_language)) {
-      $path = $source;
+    $language = $language ?: $this->languageManager->getCurrentLanguage(Language::TYPE_URL)->id;
...
-  public function getPathAlias($path, $path_language = NULL) {
+  public function getAliasByPath($path, $language = NULL) {
     // If no language is explicitly specified we default to the current URL
     // language. If we used a language different from the one conveyed by the
     // requested URL, we might end up being unable to check if there is a path
     // alias matching the URL path.
-    $path_language = $path_language ?: $this->languageManager->getCurrentLanguage(Language::TYPE_URL)->id;
-    $result = $path;
-    if (!empty($path) && $alias = $this->lookupPathAlias($path, $path_language)) {
-      $result = $alias;
+    $language = $language ?: $this->languageManager->getCurrentLanguage(Language::TYPE_URL)->id;

+++ b/core/lib/Drupal/Core/Path/AliasManagerInterface.php
@@ -10,33 +10,30 @@
+   * @param string $language
    *   An optional language code to look up the path in.
...
-  public function getSystemPath($path, $path_language = NULL);
+  public function getPathByAlias($alias, $language = NULL);
...
+   * @param string $language
    *   An optional language code to look up the path in.
...
-  public function getPathAlias($path, $path_language = NULL);
+  public function getAliasByPath($path, $language = NULL);

Since we're changing $path_language to $language let's actually pick a better name - it should be changed to $langcode since that is what it is.

Committed 1299c3a and pushed to 8.x. Thanks!

diff --git a/core/lib/Drupal/Core/Path/AliasManager.php b/core/lib/Drupal/Core/Path/AliasManager.php
index f6b40ef..55d2ddc 100644
--- a/core/lib/Drupal/Core/Path/AliasManager.php
+++ b/core/lib/Drupal/Core/Path/AliasManager.php
@@ -59,7 +59,7 @@ class AliasManager implements AliasManagerInterface {
    *
    * @var array
    */
-  protected $languagePreloaded = array();
+  protected $langcodePreloaded = array();
 
   /**
    * Holds an array of previously looked up paths for the current request path.
@@ -138,8 +138,8 @@ public function getAliasByPath($path, $langcode = NULL) {
 
     // During the first call to this method per language, load the expected
     // paths for the page from cache.
-    if (empty($this->languagePreloaded[$langcode])) {
-      $this->languagePreloaded[$langcode] = TRUE;
+    if (empty($this->langcodePreloaded[$langcode])) {
+      $this->langcodePreloaded[$langcode] = TRUE;
       $this->lookupMap[$langcode] = array();
       // Load paths from cache.
       if (!empty($this->preloadedPathLookups)) {
@@ -185,7 +185,7 @@ public function cacheClear($source = NULL) {
     }
     $this->noPath = array();
     $this->noAlias = array();
-    $this->languagePreloaded = array();
+    $this->langcodePreloaded = array();
     $this->preloadedPathLookups = array();
     $this->pathAliasWhitelistRebuild($source);
   }

Renamed the languagePreloaded to langcodePreloaded