Merge pull request #21 from ARCANEDEV/route-bindings-fix

Fix the Localization::localesNavbar() issue by using the route bindings

src/Contracts/RouteBindable.php

@@ -0,0 +1,17 @@
+<?php namespace Arcanedev\Localization\Contracts;
+
+/**
+ * Interface  RouteBindable
+ *
+ * @package   Arcanedev\Localization\Contracts
+ * @author    ARCANEDEV <[email protected]>
+ */
+interface RouteBindable
+{
+    /**
+     * Get the wildcard value from the class.
+     *
+     * @return int|string
+     */
+    public function getWildcardValue();
+}

src/Utilities/Url.php

@@ -1,5 +1,6 @@
 <?php namespace Arcanedev\Localization\Utilities;
 
+use Arcanedev\Localization\Contracts\RouteBindable;
 use Arcanedev\Localization\Contracts\UrlInterface;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
@@ -53,6 +54,10 @@ public static function extractAttributes($url = false)
     public static function substituteAttributes(array $attributes, $uri)
     {
         foreach ($attributes as $key => $value) {
+            if ($value instanceof RouteBindable) {
+                $value = $value->getWildcardValue();
+            }
+
             $uri = str_replace(['{' . $key . '?}', '{' . $key . '}'], $value, $uri);
         }
 

tests/Stubs/User.php

@@ -0,0 +1,51 @@
+<?php namespace Arcanedev\Localization\Tests\Stubs;
+
+use Arcanedev\Localization\Contracts\RouteBindable;
+
+/**
+ * Class     User
+ *
+ * @package  Arcanedev\Localization\Tests\Stubs
+ * @author   ARCANEDEV <[email protected]>
+ */
+class User implements RouteBindable
+{
+    /* ------------------------------------------------------------------------------------------------
+     |  Properties
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * User's username.
+     *
+     * @var string
+     */
+    public $username;
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Constructor
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * User constructor.
+     *
+     * @param  string  $username
+     */
+    public function __construct($username)
+    {
+        $this->username = $username;
+    }
+
+    /* ------------------------------------------------------------------------------------------------
+     |  Getters & Setters
+     | ------------------------------------------------------------------------------------------------
+     */
+    /**
+     * Get the wildcard value from the class.
+     *
+     * @return int|string
+     */
+    public function getWildcardValue()
+    {
+        return $this->username;
+    }
+}

tests/Utilities/UrlTest.php

@@ -40,4 +40,17 @@ public function it_can_unparse_url()
             $this->assertEquals($url, Url::unparse($parsed));
         }
     }
+
+    /** @test */
+    public function it_can_substitute_route_bindings()
+    {
+        $attributes = [
+            'user' => new \Arcanedev\Localization\Tests\Stubs\User('admin'),
+        ];
+
+        $this->assertEquals(
+            'users/admin',
+            Url::substituteAttributes($attributes, 'users/{user}')
+        );
+    }
 }