minor #1398 Fix tests CS violations (maelanleborgne)

weaverryan · weaverryan · commit 89278373908b · 2023-11-29T09:39:35.000-05:00
This PR was squashed before being merged into the 1.x-dev branch. Discussion ---------- Fix tests CS violations Lately CI checks fail because of an [upgrade of the default phpunit version used in phpunit-bridge](symfony/symfony#50760). This PR fixes this in the bundle's tests. And also a couple of minor cs fixes. (EDIT: just noticed the CS part was fixed in #1397 just earlier) Commits ------- 47137b2 Fix tests CS violations
diff --git a/src/Doctrine/EntityDetails.php b/src/Doctrine/EntityDetails.php
@@ -67,7 +67,7 @@ public function getFormFields(): array
             }
             $fieldsWithTypes[$fieldName] = [
                 'type' => EntityType::class,
-                'options_code' => sprintf('\'class\' => %s::class,', $relation['targetEntity']).PHP_EOL.'\'choice_label\' => \'id\',',
+                'options_code' => sprintf('\'class\' => %s::class,', $relation['targetEntity']).\PHP_EOL.'\'choice_label\' => \'id\',',
                 'extra_use_classes' => [$relation['targetEntity']],
             ];
             if (\Doctrine\ORM\Mapping\ClassMetadata::MANY_TO_MANY === $relation['type']) {
diff --git a/src/Maker/MakeCrud.php b/src/Maker/MakeCrud.php
@@ -251,10 +251,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen
                 $repositoryClassName,
             ]);
 
-
             $useStatements->addUseStatement(EntityRepository::class);
 
-
             if (EntityManagerInterface::class !== $repositoryClassName) {
                 $useStatements->addUseStatement(EntityManagerInterface::class);
             }
diff --git a/src/Test/MakerTestEnvironment.php b/src/Test/MakerTestEnvironment.php
@@ -283,7 +283,7 @@ private function buildFlexSkeleton(): void
             // do not explicitly set the PHPUnit version
             [
                 'filename' => 'phpunit.xml.dist',
-                'find' => '<server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />',
+                'find' => '<server name="SYMFONY_PHPUNIT_VERSION" value="9.6" />',
                 'replace' => '',
             ],
         ];

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public function getFormFields(): array`
`67`	`67`	`}`
`68`	`68`	`$fieldsWithTypes[$fieldName] = [`
`69`	`69`	`'type' => EntityType::class,`
`70`		`- 'options_code' => sprintf('\'class\' => %s::class,', $relation['targetEntity']).PHP_EOL.'\'choice_label\' => \'id\',',`
	`70`	`+ 'options_code' => sprintf('\'class\' => %s::class,', $relation['targetEntity']).\PHP_EOL.'\'choice_label\' => \'id\',',`
`71`	`71`	`'extra_use_classes' => [$relation['targetEntity']],`
`72`	`72`	`];`
`73`	`73`	`if (\Doctrine\ORM\Mapping\ClassMetadata::MANY_TO_MANY === $relation['type']) {`
Original file line number	Diff line number	Diff line change
`@@ -251,10 +251,8 @@ public function generate(InputInterface $input, ConsoleStyle $io, Generator $gen`
`251`	`251`	`$repositoryClassName,`
`252`	`252`	`]);`
`253`	`253`
`254`		`-`
`255`	`254`	`$useStatements->addUseStatement(EntityRepository::class);`
`256`	`255`
`257`		`-`
`258`	`256`	`if (EntityManagerInterface::class !== $repositoryClassName) {`
`259`	`257`	`$useStatements->addUseStatement(EntityManagerInterface::class);`
`260`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ private function buildFlexSkeleton(): void`
`283`	`283`	`// do not explicitly set the PHPUnit version`
`284`	`284`	`[`
`285`	`285`	`'filename' => 'phpunit.xml.dist',`
`286`		`- 'find' => '<server name="SYMFONY_PHPUNIT_VERSION" value="9.5" />',`
	`286`	`+ 'find' => '<server name="SYMFONY_PHPUNIT_VERSION" value="9.6" />',`
`287`	`287`	`'replace' => '',`
`288`	`288`	`],`
`289`	`289`	`];`