Fix sub component classes

packaged · Mar 28, 2019 · cc8a656 · cc8a656
1 parent a0d6f04
commit cc8a656
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/src/Dispatch.php b/src/Dispatch.php
@@ -149,7 +149,7 @@ public function handleRequest(Request $request): Response
         {
           try
           {
-            $manager = ResourceManager::componentPath($this->componentClassResourcePath($class));
+            $manager = ResourceManager::componentClass($class);
           }
           catch(RuntimeException $e)
           {

diff --git a/src/ResourceManager.php b/src/ResourceManager.php
@@ -23,8 +23,6 @@ class ResourceManager
   protected $_type = self::MAP_RESOURCES;
   protected $_mapOptions = [];
   protected $_baseUri = [];
-  /** @var DispatchableComponent */
-  protected $_component;
   protected $_componentPath;
   protected $_options = [];
 
@@ -87,25 +85,20 @@ public static function external()
     return new static(self::MAP_EXTERNAL, []);
   }
 
-  public static function componentPath($path)
+  public static function component(DispatchableComponent $component)
   {
-    $manager = new static(self::MAP_COMPONENT);
-    $manager->_componentPath = $path;
-    return $manager;
+    $fullClass = $component instanceof FixedClassComponent ? $component->getComponentClass() : get_class($component);
+    return static::_componentManager($fullClass, Dispatch::instance());
   }
 
-  public static function component(DispatchableComponent $component)
+  public static function componentClass(string $componentClassName)
   {
-    $dispatch = Dispatch::instance();
-    if($component instanceof FixedClassComponent)
-    {
-      $fullClass = $component->getComponentClass();
-    }
-    else
-    {
-      $fullClass = get_class($component);
-    }
-    $class = $fullClass;
+    return static::_componentManager($componentClassName, Dispatch::instance());
+  }
+
+  protected static function _componentManager($fullClass, Dispatch $dispatch = null): ResourceManager
+  {
+    $class = ltrim($fullClass, '\\');
     if($dispatch)
     {
       $maxPrefix = $maxAlias = '';
@@ -125,8 +118,8 @@ public static function component(DispatchableComponent $component)
     }
     $parts = explode('\\', $class);
     array_unshift($parts, count($parts));
+
     $manager = new static(self::MAP_COMPONENT, $parts);
-    $manager->_component = $component;
     $manager->_componentPath = $dispatch->componentClassResourcePath($fullClass);
     return $manager;
   }