Changed service to use array of Breadcrumbs. Removed Trail.

Model/Breadcrumb.php

@@ -15,12 +15,12 @@ class Breadcrumb
     /**
      * @var string Label of the breadcrumb
      */
-    private $label;
+    public $label;
 
     /**
      * @var string Url of the breadcrumb
      */
-    private $url;
+    public $url;
 
     /**
      * @param string $label Label of the breadcrumb
@@ -32,23 +32,9 @@ public function __construct($label, $url = '')
         $this->url = $url;
     }
 
-    /**
-     * @return string Label of the breadcrumb
-     */
-    public function getLabel() {
-        return $this->label;
-    }
-
-    /**
-     * @return string Url of the breadcrumb
-     */
-    public function getUrl() {
-        return $this->url;
-    }
-
     public function __toString()
     {
-        $tpl = " Object\n(\n    label => %s\n    url => %s\n)";
-        return __CLASS__ . sprintf($tpl, $this->getLabel(), $this->getUrl());
+        $tpl = " Object(\n    label => %s\n    url => %s\n)";
+        return __CLASS__ . sprintf($tpl, $this->label, $this->url);
     }
 }

Service/BreadcrumbsService.php

@@ -8,6 +8,7 @@
 use \Symfony\Component\Routing\Route;
 use \Symfony\Component\Routing\RouteCollection;
 use \Symfony\Component\Routing\RouterInterface;
+use \Xi\Bundle\BreadcrumbsBundle\Model\Breadcrumb;
 
 /**
  * A service class to build breadcrumbs from Symfony routes.
@@ -48,25 +49,27 @@ public function setRouter(RouterInterface $router)
     }
 
     /**
-     * @param string $route
-     *
+     * @param string $name
      * @return array
      */
     public function getBreadcrumbs($name, array $params = array())
     {
         $route = $this->getRoute($name);
         $parents = $this->getParents($name);
+        $breadcrumbs = array();
 
         if ($route && $parents) {
             foreach (
-                array_merge($parents, array($name)) as $n
+                array_merge($parents, array($name)) as $current
             ) {
-                $breadcrumbs[] = $this->getLabel($n, $params);
+                $breadcrumbs[$current] = new Breadcrumb(
+                    $this->getLabel($current, $params),
+                    $this->getUrl($current, $params)
+                );
             }
-            return $breadcrumbs;
-        } else {
-            return array(); // fail quickly if not found
         }
+
+        return $breadcrumbs;
     }
 
     /**
@@ -146,6 +149,7 @@ function ($tag) {
 
     /**
      * Returns only parameters applicable for the named route/label
+     *
      * @param string name
      * @return array
      */

Tests/Model/BreadcrumbTest.php

@@ -26,8 +26,8 @@ public function testConstructor()
     public function testGetters()
     {
         $bc = new Breadcrumb('foo', '/bar');
-        $this->assertEquals('foo', $bc->getLabel());
-        $this->assertEquals('/bar', $bc->getUrl());
+        $this->assertEquals('foo', $bc->label);
+        $this->assertEquals('/bar', $bc->url);
     }