From ad7708f487f3c48886658ad1349d5811b0209cc8 Mon Sep 17 00:00:00 2001
From: Dave Mc Nicoll <info@mcnd.ca>
Date: Fri, 3 Nov 2023 19:50:42 -0400
Subject: [PATCH] - Working on removing annotations for attributes

---
 src/Breadcrumb.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Breadcrumb.php b/src/Breadcrumb.php
index 87b7441..d2011d5 100644
--- a/src/Breadcrumb.php
+++ b/src/Breadcrumb.php
@@ -3,20 +3,20 @@
 use Notes\ObjectReflection,
     Notes\ObjectResolver;
 
-use Notes\Route\{ RouteFetcher, Annotation as RouteAnnotation };
+use Notes\Route\{ RouteFetcher, Attribute as RouteAttribute };
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\SimpleCache\CacheInterface;
 use RuntimeException, DirectoryIterator, Generator;
 
 class Breadcrumb extends RouteFetcher {
 
-    public function getRouteTree(RouteAnnotation\Method\Route|\Notes\Route\Attribute\Method\Route $route) : array
+    public function getRouteTree(\Notes\Route\Attribute\Method\Route $route) : array
     {
         $tree = [];
 
         $routes = $this->compile([
-            'object' => [ RouteAnnotation\Object\Route::class, Attribute\Object\Route::class ],
-            'method' => [ RouteAnnotation\Method\Route::class ],
+            'object' => [ RouteAttribute\Object\Route::class ],
+            'method' => [ RouteAttribute\Method\Route::class ],
         ]);
 
         $crumbs = $this->compile([
@@ -24,14 +24,14 @@ class Breadcrumb extends RouteFetcher {
         ]);
 
         while( $route ) {
-            $crumb = $this->getBreadcrumbAnnotation($crumbs, $route);
+            $crumb = $this->getBreadcrumbAttribute($crumbs, $route);
 
             if ($crumb) {
                 empty($tree) && $crumb->current = true;
 
                 $tree[$route->name] = $crumb;
 
-                $route = $this->getRouteAnnotation($routes, $crumb);
+                $route = $this->getRouteAttribute($routes, $crumb);
             }
             else {
                 $route = null;
@@ -41,7 +41,7 @@ class Breadcrumb extends RouteFetcher {
         return array_reverse($tree);
     }
 
-    protected function getRouteAnnotation(array $list, Annotation\Method\Breadcrumb|Attribute\Method\Breadcrumb $crumb) : null|RouteAnnotation\Method\Route|\Notes\Route\Attribute\Method\Route
+    protected function getRouteAttribute(array $list, Attribute\Method\Breadcrumb $crumb) : null|RouteAttribute\Method\Route
     {
         if ($crumb->parent ?? null) {
             foreach ($list as $route) {
@@ -54,7 +54,7 @@ class Breadcrumb extends RouteFetcher {
         return null;
     }
 
-    protected function getBreadcrumbAnnotation(array $list, RouteAnnotation\Method\Route|\Notes\Route\Attribute\Method\Route $route) : null|Annotation\Method\Breadcrumb|Attribute\Method\Breadcrumb
+    protected function getBreadcrumbAttribute(array $list, RouteAttribute\Method\Route $route) : null|Attribute\Method\Breadcrumb
     {
         foreach($list as $crumb) {
             if ($crumb->class === $route->class && $crumb->classMethod === $route->classMethod) {