Clear collection on new call

tabuna · Dec 11, 2020 · c5a6baa · c5a6baa
1 parent d2fecec
commit c5a6baa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/src/Manager.php b/src/Manager.php
@@ -21,13 +21,6 @@ class Manager
      */
     protected $generator;
 
-    /**
-     * The cached current breadcrumb trail.
-     *
-     * @var Collection
-     */
-    protected $cachedCurrentBreadcrumbs;
-
     /**
      * Create the instance of the manager.
      *
@@ -63,17 +56,13 @@ public function for(string $route, Closure $definition)
      */
     public function current($parameters = null): Collection
     {
-        if ($this->cachedCurrentBreadcrumbs) {
-            return $this->cachedCurrentBreadcrumbs;
-        }
-
         $name = optional(Route::current())->getName();
 
         if ($name === null) {
             return collect();
         }
 
-        return $this->cachedCurrentBreadcrumbs = $this->generate($name, $parameters);
+        return $this->generate($name, $parameters);
     }
 
     /**

diff --git a/src/Trail.php b/src/Trail.php
@@ -72,6 +72,10 @@ public function register(string $name, Closure $definition)
      */
     public function generate(string $route, array $parameters = []): Collection
     {
+        $this->breadcrumbs = $this->breadcrumbs->whenNotEmpty(function () {
+            return new Collection();
+        });
+
         $parameters = $this->getRouteByNameParameters($route, $parameters);
 
         if ($route && $this->registrar->has($route)) {

diff --git a/tests/BreadcrumbsTest.php b/tests/BreadcrumbsTest.php
@@ -255,11 +255,11 @@ public function testBreadcrumbsTimesOne(): void
         $this->assertEquals('1', $count);
     }
 
-
     public function testBreadcrumbsIdempotency(): void
     {
         Route::get('/breadcrumbs-home', function () {
             Breadcrumbs::current();
+            Breadcrumbs::generate('breadcrumbs-home');
 
             return Breadcrumbs::current()->toJson();
         })->name('breadcrumbs-home');