diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php index 8514bc8..ed7fad7 100644 --- a/core/lib/Drupal/Core/Template/TwigExtension.php +++ b/core/lib/Drupal/Core/Template/TwigExtension.php @@ -51,9 +51,9 @@ public function getFunctions() { // @todo re-add unset => twig_unset if this is really needed return array( // @todo Remove URL function once http://drupal.org/node/1778610 is resolved. - 'url' => new \Twig_Function_Function('url'), - 'get_url' => new \Twig_SimpleFunction('get_url', array($this, 'generateUrl')), - 'get_link' => new \Twig_SimpleFunction('get_link', array($this, 'generateLink'), array('is_safe' => array('html'))), + 'url_from_path' => new \Twig_Function_Function('url'), + 'url' => new \Twig_SimpleFunction('get_url', array($this, 'generateUrl')), + 'link' => new \Twig_SimpleFunction('get_link', array($this, 'generateLink'), array('is_safe' => array('html'))), // These functions will receive a TwigReference object, if a render array is detected 'hide' => new TwigReferenceFunction('twig_hide'), 'render_var' => new TwigReferenceFunction('twig_render_var'), diff --git a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php index 48f1bf0..61f9eac 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php +++ b/core/modules/system/lib/Drupal/system/Tests/Theme/ThemeTestTwig.php @@ -56,14 +56,14 @@ public function testTwigUrlGenerator() { $url_generator = $this->container->get('url_generator'); $link_generator = $this->container->get('link_generator'); $expected = array( - 'url not absolute: ' . $url_generator->generateFromPath('user/register'), - 'url absolute: ' . $url_generator->generateFromPath('user/register', array('absolute' => TRUE)), - 'get_url not absolute: ' . $url_generator->generateFromRoute('user_register'), - 'get_url absolute: ' . $url_generator->generateFromRoute('user_register', array(), array('absolute' => TRUE)), - 'get_url absolute with fragment: ' . $url_generator->generateFromRoute('user_register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')), - 'get_link not absolute: ' . $link_generator->generate('Register', 'user_register'), - 'get_link absolute: ' . $link_generator->generate('Register', 'user_register', array(), array('absolute' => TRUE)), - 'get_link absolute with fragment: ' . $link_generator->generate('Register', 'user_register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')), + 'url_from_path not absolute: ' . $url_generator->generateFromPath('user/register'), + 'url_from_path absolute: ' . $url_generator->generateFromPath('user/register', array('absolute' => TRUE)), + 'url not absolute: ' . $url_generator->generateFromRoute('user_register'), + 'url absolute: ' . $url_generator->generateFromRoute('user_register', array(), array('absolute' => TRUE)), + 'url absolute with fragment: ' . $url_generator->generateFromRoute('user_register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')), + 'link not absolute: ' . $link_generator->generate('Register', 'user_register'), + 'link absolute: ' . $link_generator->generate('Register', 'user_register', array(), array('absolute' => TRUE)), + 'link absolute with fragment: ' . $link_generator->generate('Register', 'user_register', array(), array('absolute' => TRUE, 'fragment' => 'bottom')), ); // Make sure we got something. $content = $this->drupalGetContent(); diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_generator.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_generator.html.twig index c66e789..569718f 100644 --- a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_generator.html.twig +++ b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.url_generator.html.twig @@ -1,20 +1,20 @@ -{# Test the url twig function #} -
url not absolute: {{ url('user/register') }}
+{# Test the url_from_path twig function #} +
url_from_path not absolute: {{ url_from_path('user/register') }}
-
url absolute: {{ url('user/register', {'absolute': 1 }) }}
+
url_from_path absolute: {{ url_from_path('user/register', {'absolute': 1 }) }}
-{# Test the get_url twig function #} +{# Test the url twig function #} -
get_url not absolute: {{ get_url('user_register') }}
+
url not absolute: {{ url('user_register') }}
-
get_url absolute: {{ get_url('user_register', {}, {'absolute': '1' }) }}
+
url absolute: {{ url('user_register', {}, {'absolute': '1' }) }}
-
get_url absolute with fragment: {{ get_url('user_register', {}, {'absolute': '1', 'fragment': 'bottom' }) }}
+
url absolute with fragment: {{ url('user_register', {}, {'absolute': '1', 'fragment': 'bottom' }) }}
-{# Test the get_link twig function #} +{# Test the link twig function #} -
get_link not absolute: {{ get_link('Register', 'user_register') }}
+
link not absolute: {{ link('Register', 'user_register') }}
-
get_link absolute: {{ get_link('Register', 'user_register', {}, {'absolute': '1' }) }}
+
link absolute: {{ link('Register', 'user_register', {}, {'absolute': '1' }) }}
-
get_link absolute with fragment: {{ get_link('Register', 'user_register', {}, {'absolute': '1', 'fragment': 'bottom' }) }}
+
link absolute with fragment: {{ link('Register', 'user_register', {}, {'absolute': '1', 'fragment': 'bottom' }) }}