simplify class generation

Author: jrushlow

src/Generator.php

@@ -76,6 +76,36 @@ public function generateClass(string $className, string $templateName, array $va
         return $targetPath;
     }
 
+    /**
+     * Future replacement for generateClass().
+     *
+     * @internal
+     *
+     * @param string $templateName Template name in Resources/skeleton to use
+     * @param array  $variables    Array of variables to pass to the template
+     *
+     * @return string The path where the file will be created
+     *
+     * @throws \Exception
+     */
+    final public function generateClassFromClassData(ClassData $classData, string $templateName, array $variables = []): string
+    {
+        $classData = $this->templateComponentGenerator->configureClass($classData);
+        $targetPath = $this->fileManager->getRelativePathForFutureClass($classData->getFullClassName());
+
+        if (null === $targetPath) {
+            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,
+        ]);
+
+        $this->addOperation($targetPath, $templateName, $variables);
+
+        return $targetPath;
+    }
+
     /**
      * Generate a normal file from a template.
      *

src/Maker/MakeValidator.php

@@ -66,21 +66,17 @@ class: \sprintf('Validator\\%s', Str::removeSuffix($validatorClassData->getClass
             extendsClass: Constraint::class,
         );
 
-        $generator->generateClass(
-            $validatorClassData->getFullClassName(),
+        $generator->generateClassFromClassData(
+            $validatorClassData,
             'validator/Validator.tpl.php',
             [
-                'class_data' => $validatorClassData,
                 'constraint_class_name' => $constraintDataClass->getClassName(),
             ]
         );
 
-        $generator->generateClass(
-            $constraintDataClass->getFullClassName(),
+        $generator->generateClassFromClassData(
+            $constraintDataClass,
             'validator/Constraint.tpl.php',
-            [
-                'class_data' => $constraintDataClass,
-            ]
         );
 
         $generator->writeChanges();

src/Maker/MakeVoter.php

@@ -60,10 +60,9 @@ class: \sprintf('Security\Voter\%s', $input->getArgument('name')),
             ]
         );
 
-        $generator->generateClass(
-            $voterClassData->getFullClassName(),
+        $generator->generateClassFromClassData(
+            $voterClassData,
             'security/Voter.tpl.php',
-            ['class_data' => $voterClassData]
         );
 
         $generator->writeChanges();