generate the controller from the class data method

jrushlow · jrushlow · commit d372c76b7f22 · 2024-09-26T18:46:41.000-04:00
diff --git a/src/Generator.php b/src/Generator.php
@@ -83,12 +83,15 @@ public function generateClass(string $className, string $templateName, array $va
      *
      * @param string $templateName Template name in Resources/skeleton to use
      * @param array  $variables    Array of variables to pass to the template
+     * @param bool   $isController Set to true if generating a Controller that needs
+     *                             access to the TemplateComponentGenerator ("generator") in
+     *                             the twig template. e.g. to create route attributes on the index method
      *
      * @return string The path where the file will be created
      *
      * @throws \Exception
      */
-    final public function generateClassFromClassData(ClassData $classData, string $templateName, array $variables = []): string
+    final public function generateClassFromClassData(ClassData $classData, string $templateName, array $variables = [], bool $isController = false): string
     {
         $classData = $this->templateComponentGenerator->configureClass($classData);
         $targetPath = $this->fileManager->getRelativePathForFutureClass($classData->getFullClassName());
@@ -97,11 +100,13 @@ final public function generateClassFromClassData(ClassData $classData, string $t
             throw new \LogicException(\sprintf('Could not determine where to locate the new class "%s", maybe try with a full namespace like "\\My\\Full\\Namespace\\%s"', $classData->getFullClassName(), $classData->getClassName()));
         }
 
-        $variables = array_merge($variables, [
-            'class_data' => $classData,
-        ]);
+        $globalTemplateVars = ['class_data' => $classData];
 
-        $this->addOperation($targetPath, $templateName, $variables);
+        if ($isController) {
+            $globalTemplateVars['generator'] = $this->templateComponentGenerator;
+        }
+
+        $this->addOperation($targetPath, $templateName, array_merge($variables, $globalTemplateVars));
 
         return $targetPath;
     }
diff --git a/src/Maker/MakeController.php b/src/Maker/MakeController.php
@@ -93,21 +93,29 @@ class: $isAbsolute ? substr($controllerClass, 1) : \sprintf('Controller\%s', $in
             .($isInvokable ? '.html.twig' : '/index.html.twig')
         ;
 
-        $controllerPath = $generator->generateController(
-            $controllerClassData->getFullClassName(),
-            'controller/Controller.tpl.php',
-            [
-                'class_data' => $controllerClassData,
-                //                'use_statements' => $useStatements,
-                //                'route_path' => Str::asRoutePath($controllerClassNameDetails->getRelativeNameWithoutSuffix()),
-                'route_path' => Str::asRoutePath($controllerClassData->getClassName(relative: true, withoutSuffix: true)),
-                'route_name' => Str::AsRouteName($controllerClassData->getClassName(relative: true, withoutSuffix: true)),
-                //                'route_name' => Str::asRouteName($controllerClassNameDetails->getRelativeNameWithoutSuffix()),
-                'method_name' => $isInvokable ? '__invoke' : 'index',
-                'with_template' => $withTemplate,
-                'template_name' => $templateName,
-            ]
-        );
+        $controllerPath = $generator->generateClassFromClassData($controllerClassData, 'controller/Controller.tpl.php', [
+            'route_path' => Str::asRoutePath($controllerClassData->getClassName(relative: true, withoutSuffix: true)),
+            'route_name' => Str::AsRouteName($controllerClassData->getClassName(relative: true, withoutSuffix: true)),
+            'method_name' => $isInvokable ? '__invoke' : 'index',
+            'with_template' => $withTemplate,
+            'template_name' => $templateName,
+        ], true);
+
+        //        $controllerPath = $generator->generateController(
+        //            $controllerClassData->getFullClassName(),
+        //            'controller/Controller.tpl.php',
+        //            [
+        //                'class_data' => $controllerClassData,
+        //                //                'use_statements' => $useStatements,
+        //                //                'route_path' => Str::asRoutePath($controllerClassNameDetails->getRelativeNameWithoutSuffix()),
+        //                'route_path' => Str::asRoutePath($controllerClassData->getClassName(relative: true, withoutSuffix: true)),
+        //                'route_name' => Str::AsRouteName($controllerClassData->getClassName(relative: true, withoutSuffix: true)),
+        //                //                'route_name' => Str::asRouteName($controllerClassNameDetails->getRelativeNameWithoutSuffix()),
+        //                'method_name' => $isInvokable ? '__invoke' : 'index',
+        //                'with_template' => $withTemplate,
+        //                'template_name' => $templateName,
+        //            ]
+        //        );
 
         if ($withTemplate) {
             $generator->generateTemplate(
diff --git a/src/Resources/skeleton/controller/Controller.tpl.php b/src/Resources/skeleton/controller/Controller.tpl.php
@@ -12,7 +12,7 @@ public function <?= $method_name ?>(): <?php if ($with_template) { ?>Response<?p
     {
 <?php if ($with_template) { ?>
         return $this->render('<?= $template_name ?>', [
-            'controller_name' => '<?= $class_name ?>',
+            'controller_name' => '<?= $class_data->getClassName() ?>',
         ]);
 <?php } else { ?>
         return $this->json([

Original file line number	Diff line number	Diff line change
`@@ -83,12 +83,15 @@ public function generateClass(string $className, string $templateName, array $va`
`83`	`83`	`*`
`84`	`84`	`* @param string $templateName Template name in Resources/skeleton to use`
`85`	`85`	`* @param array $variables Array of variables to pass to the template`
	`86`	`+ * @param bool $isController Set to true if generating a Controller that needs`
	`87`	`+ * access to the TemplateComponentGenerator ("generator") in`
	`88`	`+ * the twig template. e.g. to create route attributes on the index method`
`86`	`89`	`*`
`87`	`90`	`* @return string The path where the file will be created`
`88`	`91`	`*`
`89`	`92`	`* @throws \Exception`
`90`	`93`	`*/`
`91`		`- final public function generateClassFromClassData(ClassData $classData, string $templateName, array $variables = []): string`
	`94`	`+ final public function generateClassFromClassData(ClassData $classData, string $templateName, array $variables = [], bool $isController = false): string`
`92`	`95`	`{`
`93`	`96`	`$classData = $this->templateComponentGenerator->configureClass($classData);`
`94`	`97`	`$targetPath = $this->fileManager->getRelativePathForFutureClass($classData->getFullClassName());`
`@@ -97,11 +100,13 @@ final public function generateClassFromClassData(ClassData $classData, string $t`
`97`	`100`	`throw new \LogicException(\sprintf('Could not determine where to locate the new class "%s", maybe try with a full namespace like "\\My\\Full\\Namespace\\%s"', $classData->getFullClassName(), $classData->getClassName()));`
`98`	`101`	`}`
`99`	`102`
`100`		`- $variables = array_merge($variables, [`
`101`		`- 'class_data' => $classData,`
`102`		`- ]);`
	`103`	`+ $globalTemplateVars = ['class_data' => $classData];`
`103`	`104`
`104`		`- $this->addOperation($targetPath, $templateName, $variables);`
	`105`	`+ if ($isController) {`
	`106`	`+ $globalTemplateVars['generator'] = $this->templateComponentGenerator;`
	`107`	`+ }`
	`108`	`+`
	`109`	`+ $this->addOperation($targetPath, $templateName, array_merge($variables, $globalTemplateVars));`
`105`	`110`
`106`	`111`	`return $targetPath;`
`107`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public function <?= $method_name ?>(): <?php if ($with_template) { ?>Response<?p`
`12`	`12`	`{`
`13`	`13`	`<?php if ($with_template) { ?>`
`14`	`14`	`return $this->render('<?= $template_name ?>', [`
`15`		`- 'controller_name' => '<?= $class_name ?>',`
	`15`	`+ 'controller_name' => '<?= $class_data->getClassName() ?>',`
`16`	`16`	`]);`
`17`	`17`	`<?php } else { ?>`
`18`	`18`	`return $this->json([`