fix: factory template formatting (#1110)

enekochan · web-flow · commit 1408436a95e4 · 2026-03-29T18:29:23.000+02:00
* Fix Factory template formatting Because of how php tag works the output of `make:factory` generates some "not so pretty" PHP code. It lacks some carriage returns that place `Override` attributes where they shouldn't be and has more spaces than needed in some places. Generated code: ```php <?php namespace App\Factory; use App\Entity\User; use App\Repository\UserRepository; use Doctrine\ORM\EntityRepository; use Zenstruck\Foundry\Persistence\PersistentObjectFactory; use Zenstruck\Foundry\Persistence\Proxy; use Zenstruck\Foundry\Persistence\ProxyRepositoryDecorator; /** * @extends PersistentObjectFactory<User> */ final class UserFactory extends PersistentObjectFactory{ /** * @see https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#factories-as-services * * @todo inject services if required */ public function __construct() { } #[\Override] public static function class(): string { return User::class; } /** * @see https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#model-factories * * @todo add your default values here */ #[\Override] protected function defaults(): array|callable { return [ 'name' => self::faker()->text(10), ]; } /** * @see https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#initialization */ #[\Override] protected function initialize(): static { return $this // ->afterInstantiate(function(User $user): void {}) ; } } ``` * Remove parent constructor call in Factory class Removed unnecessary parent constructor call in the Factory class.
diff --git a/skeleton/Factory.tpl.php b/skeleton/Factory.tpl.php
@@ -25,7 +25,7 @@
 }
 ?>
  */
-final class <?php echo $class_name; ?> extends <?php echo $makeFactoryData->getFactoryClassShortName(); ?>
+final class <?php echo $class_name; ?> extends <?php echo $makeFactoryData->getFactoryClassShortName(); ?><?= "\n" ?>
 {
 <?php if ($makeFactoryData->shouldAddHints()): ?>    /**
      * @see https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#factories-as-services
@@ -36,19 +36,19 @@ public function __construct()
     {
     }
 
-<?php endif ?><?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?>    #[\Override]<?php endif ?>
+<?php endif ?><?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?>    #[\Override]<?= "\n" ?><?php endif ?>
     public static function class(): string
     {
         return <?php echo $makeFactoryData->getObjectShortName(); ?>::class;
     }
 
-<?php if ($makeFactoryData->shouldAddHints()): ?>        /**
+<?php if ($makeFactoryData->shouldAddHints()): ?>    /**
      * @see https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#model-factories
      *
      * @todo add your default values here
      */
-<?php endif ?><?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?>    #[\Override]<?php endif ?>
-    protected function defaults(): array<?php if ($makeFactoryData->shouldAddHints()): ?>|callable<?php endif ?>
+<?php endif ?><?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?>    #[\Override]<?= "\n" ?><?php endif ?>
+    protected function defaults(): array<?php if ($makeFactoryData->shouldAddHints()): ?>|callable<?= "\n" ?><?php endif ?>
     {
         return [
 <?php
@@ -59,10 +59,10 @@ protected function defaults(): array<?php if ($makeFactoryData->shouldAddHints()
         ];
     }
 
-<?php if ($makeFactoryData->shouldAddHints()): ?>        /**
+<?php if ($makeFactoryData->shouldAddHints()): ?>    /**
      * @see https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#initialization
      */
-<?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?>    #[\Override]<?php endif ?>
+<?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?>    #[\Override]<?= "\n" ?><?php endif ?>
     protected function initialize(): static
     {
         return $this

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`}`
`26`	`26`	`?>`
`27`	`27`	`*/`
`28`		`-final class <?php echo $class_name; ?> extends <?php echo $makeFactoryData->getFactoryClassShortName(); ?>`
	`28`	`+final class <?php echo $class_name; ?> extends <?php echo $makeFactoryData->getFactoryClassShortName(); ?><?= "\n" ?>`
`29`	`29`	`{`
`30`	`30`	`<?php if ($makeFactoryData->shouldAddHints()): ?> /**`
`31`	`31`	`* @see https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#factories-as-services`
`@@ -36,19 +36,19 @@ public function __construct()`
`36`	`36`	`{`
`37`	`37`	`}`
`38`	`38`
`39`		`-<?php endif ?><?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?> #[\Override]<?php endif ?>`
	`39`	`+<?php endif ?><?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?> #[\Override]<?= "\n" ?><?php endif ?>`
`40`	`40`	`public static function class(): string`
`41`	`41`	`{`
`42`	`42`	`return <?php echo $makeFactoryData->getObjectShortName(); ?>::class;`
`43`	`43`	`}`
`44`	`44`
`45`		`-<?php if ($makeFactoryData->shouldAddHints()): ?> /**`
	`45`	`+<?php if ($makeFactoryData->shouldAddHints()): ?> /**`
`46`	`46`	`* @see https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#model-factories`
`47`	`47`	`*`
`48`	`48`	`* @todo add your default values here`
`49`	`49`	`*/`
`50`		`-<?php endif ?><?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?> #[\Override]<?php endif ?>`
`51`		`- protected function defaults(): array<?php if ($makeFactoryData->shouldAddHints()): ?>\|callable<?php endif ?>`
	`50`	`+<?php endif ?><?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?> #[\Override]<?= "\n" ?><?php endif ?>`
	`51`	`+ protected function defaults(): array<?php if ($makeFactoryData->shouldAddHints()): ?>\|callable<?= "\n" ?><?php endif ?>`
`52`	`52`	`{`
`53`	`53`	`return [`
`54`	`54`	`<?php`
`@@ -59,10 +59,10 @@ protected function defaults(): array<?php if ($makeFactoryData->shouldAddHints()`
`59`	`59`	`];`
`60`	`60`	`}`
`61`	`61`
`62`		`-<?php if ($makeFactoryData->shouldAddHints()): ?> /**`
	`62`	`+<?php if ($makeFactoryData->shouldAddHints()): ?> /**`
`63`	`63`	`* @see https://symfony.com/bundles/ZenstruckFoundryBundle/current/index.html#initialization`
`64`	`64`	`*/`
`65`		`-<?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?> #[\Override]<?php endif ?>`
	`65`	`+<?php if ($makeFactoryData->shouldAddOverrideAttributes()): ?> #[\Override]<?= "\n" ?><?php endif ?>`
`66`	`66`	`protected function initialize(): static`
`67`	`67`	`{`
`68`	`68`	`return $this`