Support multiple component aliases

Author: bajb

src/Dispatch.php

@@ -46,7 +46,7 @@ public static function destroy()
 
   protected $_aliases = [];
   protected $_projectRoot;
-  protected $_componentsNamespace;
+  protected $_componentAliases = [];
 
   public function __construct($projectRoot, $baseUri = null)
   {
@@ -86,23 +86,15 @@ public function getBaseUri()
     return $this->_baseUri;
   }
 
-  /**
-   * @return mixed
-   */
-  public function getComponentsNamespace()
+  public function addComponentAlias($namespace, $alias)
   {
-    return $this->_componentsNamespace;
+    $this->_componentAliases['_' . $alias] = $namespace;
+    return $this;
   }
 
-  /**
-   * @param mixed $componentsNs
-   *
-   * @return Dispatch
-   */
-  public function setComponentsNamespace($componentsNs)
+  public function getComponentAliases()
   {
-    $this->_componentsNamespace = $componentsNs;
-    return $this;
+    return $this->_componentAliases;
   }
 
   /**
@@ -136,9 +128,9 @@ public function handle(Request $request): Response
         for($i = 0; $i < $len; $i++)
         {
           $part = array_shift($pathParts);
-          if($i == 0 && $part == '_')
+          if($i == 0 && isset($this->_componentAliases[$part]))
           {
-            $class = $this->getComponentsNamespace();
+            $class = $this->_componentAliases[$part];
           }
           else
           {

src/ResourceManager.php

@@ -68,8 +68,17 @@ public static function component(DispatchableComponent $component)
     $class = get_class($component);
     if($dispatch)
     {
-      $prefix = Strings::commonPrefix($class, ltrim($dispatch->getComponentsNamespace(), '\\'));
-      $class = str_replace($prefix, '_', $class);
+      $maxPrefix = $maxAlias = '';
+      foreach($dispatch->getComponentAliases() as $alias => $namespace)
+      {
+        $prefix = Strings::commonPrefix($class, ltrim($namespace, '\\'));
+        if(strlen($prefix) > strlen($maxPrefix))
+        {
+          $maxPrefix = $prefix;
+          $maxAlias = $alias;
+        }
+      }
+      $class = str_replace($maxPrefix, $maxAlias, $class);
     }
     $parts = explode('\\', $class);
     array_unshift($parts, count($parts));

tests/DispatchTest.php

@@ -97,7 +97,7 @@ public function testComponent()
     Dispatch::bind($dispatch);
 
     $component = new DemoComponent();
-    Dispatch::instance()->setComponentsNamespace('\Packaged\Dispatch\Tests\TestComponents');
+    Dispatch::instance()->addComponentAlias('\Packaged\Dispatch\Tests\TestComponents', '');
     $manager = ResourceManager::component($component);
     $uri = $manager->getResourceUri('style.css');
     $this->assertEquals('c/3/_/DemoComponent/DemoComponent/a4197ed8/style.css', $uri);
@@ -117,6 +117,11 @@ public function testComponent()
     $this->assertEquals(200, $response->getStatusCode());
     $this->assertContains('body{color:orange}', $response->getContent());
 
+    Dispatch::instance()->addComponentAlias('\Packaged\Dispatch\Tests\TestComponents\DemoComponent', 'DC');
+    $manager = ResourceManager::component(new DemoComponent());
+    $uri = $manager->getResourceUri('style.css');
+    $this->assertEquals('c/2/_DC/DemoComponent/a4197ed8/style.css', $uri);
+
     $request = Request::create('/c/3/_/MissingComponent/DemoComponent/a4197ed8/style.css');
     $response = $dispatch->handle($request);
     $this->assertEquals(404, $response->getStatusCode());

tests/ResourceManagerTest.php

@@ -54,7 +54,7 @@ public function testComponent()
       'c/6/Packaged/Dispatch/Tests/TestComponents/DemoComponent/DemoComponent/a4197ed8/style.css',
       $manager->getResourceUri('style.css')
     );
-    Dispatch::instance()->setComponentsNamespace('\Packaged\Dispatch\Tests\TestComponents');
+    Dispatch::instance()->addComponentAlias('\Packaged\Dispatch\Tests\TestComponents','');
     $manager = ResourceManager::component($component);
     $this->assertEquals(
       'c/3/_/DemoComponent/DemoComponent/a4197ed8/style.css',