Merge pull request #146 from silverleague/controller-fixes

Fix when the namespace contains 'Controller'
silverleague · Nov 29, 2022 · e0c3915 · e0c3915
2 parents 0589668 + 134580b
commit e0c3915
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Generators/AbstractTagGenerator.php b/src/Generators/AbstractTagGenerator.php
@@ -214,7 +214,7 @@ protected function generateOwnerTags()
         if ($reflection->isAbstract()) {
             return;
         }
-        if (Injector::inst()->get($this->className) instanceof Extension) {
+        if ($reflection instanceof Extension) {
             $owners = iterator_to_array($this->getOwnerClasses($className));
             $owners[] = $this->className;
             $tagString = sprintf('\\%s $owner', implode("|\\", array_values($owners)));

diff --git a/src/Generators/ControllerTagGenerator.php b/src/Generators/ControllerTagGenerator.php
@@ -42,7 +42,12 @@ protected function generateTags()
      */
     protected function generateControllerObjectTags()
     {
-        $pageClassname = str_replace(['_Controller', 'Controller'], '', $this->className);
+        $shortName = ClassInfo::shortName($this->className);
+        // Strip "Controller" or "_Controller" from the class short name
+        $shortSansController = str_replace(['_Controller', 'Controller'], '', $shortName);
+        // And push it back in :)
+        $pageClassname = str_replace($shortName, $shortSansController, $this->className);
+
         if (class_exists($pageClassname) && $this->isContentController($this->className)) {
             $pageClassname = $this->getAnnotationClassName($pageClassname);