Use qualified name for namespace links in overview tree. Show full project namespace in nav tree.

Author: othercorey

src/Project.php

@@ -56,7 +56,7 @@ public function __construct(string $projectPath, array $config)
         $this->setConfig($config);
 
         foreach ((array)$this->_config['namespaces'] as $namespace) {
-            $this->namespaces[$namespace] = new ProjectNamespace($namespace);
+            $this->namespaces[$namespace] = new ProjectNamespace($namespace, $namespace);
         }
 
         $this->loader = new Loader($projectPath);
@@ -196,7 +196,7 @@ protected function createClassLoader(string $projectPath): ?ClassLoader
     protected function getNamespace(?string $qualifiedName): ProjectNamespace
     {
         if ($qualifiedName === null) {
-            return $this->namespaces[''] ??= new ProjectNamespace(null);
+            return $this->namespaces[''] ??= new ProjectNamespace('Global', null);
         }
 
         $namespace = null;
@@ -222,7 +222,8 @@ protected function getNamespace(?string $qualifiedName): ProjectNamespace
                 continue;
             }
 
-            $child = $namespace->children[$name] = new ProjectNamespace($namespace->qualifiedName . '\\' . $name);
+            $child = new ProjectNamespace($name, $namespace->qualifiedName . '\\' . $name);
+            $namespace->children[$name] = $child;
             ksort($namespace->children);
 
             $namespace = $child;

src/ProjectNamespace.php

@@ -62,16 +62,12 @@ class ProjectNamespace
     public array $traits = [];
 
     /**
+     * @param string $name Display name
      * @param string|null $qualifiedName Qualified name
      */
-    public function __construct(?string $qualifiedName)
+    public function __construct(string $name, ?string $qualifiedName)
     {
-        if (!$qualifiedName) {
-            $this->name = $qualifiedName ?: 'Global';
-        } else {
-            $lastSlash = strrpos($qualifiedName, '\\');
-            $this->name = substr($qualifiedName, $lastSlash + 1);
-        }
+        $this->name = $name;
         $this->qualifiedName = $qualifiedName;
     }
 

templates/pages/namespace.twig

@@ -1,6 +1,6 @@
 {% extends 'page.twig' %}
 
-{% block title 'Namespace ' ~ namespace.name|default(namespace.name) %}
+{% block title 'Namespace ' ~ namespace.qualifiedName|default(namespace.name) %}
 
 {% block content %}
 <div class="section namespace">
@@ -12,7 +12,7 @@
       <ul class="summary-list">
         {% for child in namespace.children %}
         <li>
-          <a href="{{ child.qualifiedName|namespace_to_url }}">{{ child.qualifiedName ?? child.name }}</a>
+          <a href="{{ child.qualifiedName|namespace_to_url }}">{{ child.qualifiedName|default(child.name) }}</a>
         </li>
         {% endfor %}
       </ul>

templates/pages/overview.twig

@@ -10,7 +10,7 @@
   <ul>
     {% macro showNamespace(namespace) %}
       <li>
-        <a href="{{ namespace.name|namespace_to_url }}">{{ namespace.name|default(namespace.name) }}</a>
+        <a href="{{ namespace.qualifiedName|namespace_to_url }}">{{ namespace.qualifiedName|default(namespace.name) }}</a>
         <ul>
         {% for child in namespace.children %}
           {{ _self.showNamespace(child) }}