Merge branch 'urlFor'

Closes #102
Fixes #101

Author: akrabat

src/TwigExtension.php

@@ -8,6 +8,8 @@
  */
 namespace Slim\Views;
 
+use Slim\Http\Uri;
+
 class TwigExtension extends \Twig\Extension\AbstractExtension
 {
     /**
@@ -35,6 +37,7 @@ public function getFunctions()
     {
         return [
             new \Twig\TwigFunction('path_for', array($this, 'pathFor')),
+            new \Twig\TwigFunction('full_url_for', array($this, 'fullUrlFor')),
             new \Twig\TwigFunction('base_url', array($this, 'baseUrl')),
             new \Twig\TwigFunction('is_current_path', array($this, 'isCurrentPath')),
             new \Twig\TwigFunction('current_path', array($this, 'currentPath')),
@@ -46,6 +49,35 @@ public function pathFor($name, $data = [], $queryParams = [], $appName = 'defaul
         return $this->router->pathFor($name, $data, $queryParams);
     }
 
+    /**
+     * Similar to pathFor but returns a fully qualified URL
+     *
+     * @param string $name The name of the route
+     * @param array $data Route placeholders
+     * @param array $queryParams
+     * @param string $appName
+     * @return string fully qualified URL
+     */
+    public function fullUrlFor($name, $data = [], $queryParams = [], $appName = 'default')
+    {
+        $path = $this->pathFor($name, $data, $queryParams, $appName);
+
+        /** @var Uri $uri */
+        if (is_string($this->uri)) {
+            $uri = Uri::createFromString($this->uri);
+        } else {
+            $uri = $this->uri;
+        }
+
+        $scheme = $uri->getScheme();
+        $authority = $uri->getAuthority();
+
+        $host = ($scheme ? $scheme . ':' : '')
+            . ($authority ? '//' . $authority : '');
+
+        return $host.$path;
+    }
+
     public function baseUrl()
     {
         if (is_string($this->uri)) {

tests/TwigExtensionTest.php

@@ -74,4 +74,18 @@ public function testCurrentPath($router, $uri, $withQueryString, $expected)
 
         $this->assertEquals($expected, $result);
     }
+
+    public function testFullUrlFor()
+    {
+        $router = new Router();
+        $router->setBasePath('/app');
+        $router->map(['GET'], '/activate/{token}', null)->setName('activate');
+        $uri = Uri::createFromString('http://example.com/app/hello/world?a=b');
+
+        $extension = new TwigExtension($router, $uri);
+        $result = $extension->fullUrlFor('activate', ['token' => 'foo']);
+
+        $expected = 'http://example.com/app/activate/foo';
+        $this->assertEquals($expected, $result);
+    }
 }