get the property type from global generator

Author: jrushlow

src/Generator.php

@@ -16,7 +16,6 @@
 use Symfony\Bundle\MakerBundle\Exception\RuntimeCommandException;
 use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
 use Symfony\Bundle\MakerBundle\Util\PhpCompatUtil;
-use Symfony\Bundle\MakerBundle\Util\TemplateClassHelper;
 use Symfony\Bundle\MakerBundle\Util\TemplateComponentGenerator;
 
 /**
@@ -157,15 +156,7 @@ public function createClassNameDetails(string $name, string $namespacePrefix, st
             $fullNamespacePrefix = $this->fileManager->getNamespacePrefixForClass($className);
         }
 
-        return new ClassNameDetails($className, $fullNamespacePrefix, $suffix, $this->phpCompatUtil->canUseTypedProperties());
-    }
-
-    /**
-     * @experimental The method signature may change, moved, or be removed.
-     */
-    public function createClassHelper(string $fullyQualifiedClassName): TemplateClassHelper
-    {
-        return new TemplateClassHelper($fullyQualifiedClassName, $this->phpCompatUtil->canUseTypedProperties());
+        return new ClassNameDetails($className, $fullNamespacePrefix, $suffix);
     }
 
     public function getRootDirectory(): string

src/Resources/skeleton/registration/RegistrationController.tpl.php

@@ -7,7 +7,7 @@
 class <?= $class_name; ?> extends <?= $parent_class_name; ?><?= "\n" ?>
 {
 <?php if ($will_verify_email): ?>
-    private <?= $email_verifier_class_details->getPropertyType() ?>$emailVerifier;
+    private <?= $generator->getPropertyType($email_verifier_class_details) ?>$emailVerifier;
 
     public function __construct(<?= $email_verifier_class_details->getShortName() ?> $emailVerifier)
     {

src/Util/ClassNameDetails.php

@@ -18,16 +18,12 @@ final class ClassNameDetails
     private $fullClassName;
     private $namespacePrefix;
     private $suffix;
-    private $usesTypedProperties;
 
-    public function __construct(string $fullClassName, string $namespacePrefix, string $suffix = null, ?bool $usesTypedProperties = null)
+    public function __construct(string $fullClassName, string $namespacePrefix, string $suffix = null)
     {
         $this->fullClassName = $fullClassName;
         $this->namespacePrefix = trim($namespacePrefix, '\\');
         $this->suffix = $suffix;
-        $this->usesTypedProperties = $usesTypedProperties;
-
-        // @TODO throw deprecation if bool not passed....
     }
 
     public function getFullName(): string
@@ -40,15 +36,6 @@ public function getShortName(): string
         return Str::getShortClassName($this->fullClassName);
     }
 
-    public function getPropertyType(): ?string
-    {
-        if (!$this->usesTypedProperties) {
-            return null;
-        }
-
-        return sprintf('%s ', $this->getShortName());
-    }
-
     /**
      * Returns the original class name the user entered (after
      * being cleaned up).

src/Util/TemplateComponentGenerator.php

@@ -87,4 +87,13 @@ public function generateRouteForControllerMethod(string $routePath, string $rout
 
         return $annotation;
     }
+
+    public function getPropertyType(ClassNameDetails $classNameDetails): ?string
+    {
+        if (!$this->phpCompatUtil->canUseTypedProperties()) {
+            return null;
+        }
+
+        return sprintf('%s ', $classNameDetails->getShortName());
+    }
 }