url() and urlInfo() are deprecated

+++ b/src/Tests/TokenCurrentPageTest.php
@@ -43,13 +43,13 @@ class TokenCurrentPageTest extends TokenTestBase {
-      '[current-page:url:absolute]' => $node->url('canonical', array('absolute' => TRUE)),
-      '[current-page:url:relative]' => $node->url(),
+      '[current-page:url]' => $node->toUrl('canonical', array('absolute' => TRUE)),
+      '[current-page:url:absolute]' => $node->toUrl('canonical', array('absolute' => TRUE)),
+      '[current-page:url:relative]' => $node->toUrl(),

url() returns a string and falls back to empty if not set. toUrl() returns a Url object on which you need to call toString() and it can throw an exception. Here in the tests not an issue but we need to be careful with the actual hook implementations.

+++ b/token.tokens.inc
@@ -854,7 +854,7 @@ function token_tokens($type, array $tokens, array $data = array(), array $option
       switch ($name) {
         case 'url':
-          if (_token_module($type, 'url') == 'token' && $url = $entity->url()) {
+          if (_token_module($type, 'url') == 'token' && $url = $entity->toUrl()->toString()) {
             $replacements[$original] = $url;

Do we already only expose the url token for entity types that have a canonical link template? If not then we should add a hasLinkTemplate('canonical') around it to prevent an exception when using that on an entity type that has no canonical route. And possibly also an !$entity->isNew(), imagine a node:url token being used on a node preview for example.

Thanks, committed.