return whole PhpFile from ClassGenerator

Author: jiripudil

src/ClassGenerator.php

@@ -13,7 +13,7 @@
 final class ClassGenerator
 {
 
-	public function generateClass(ClassDefinition $definition): Code\PhpNamespace
+	public function generateClass(ClassDefinition $definition): Code\PhpFile
 	{
 		$draft = ClassInNamespace::fromDefinition($definition);
 		$namespace = $draft->getNamespace();
@@ -51,7 +51,11 @@ public function generateClass(ClassDefinition $definition): Code\PhpNamespace
 		}
 
 
-		return $namespace;
+		$file = new Code\PhpFile();
+		$file->setStrictTypes();
+		$file->addNamespace($namespace);
+
+		return $file;
 	}
 
 

src/Console/GenerateClassCommand.php

@@ -86,20 +86,18 @@ private function processFile(string $definitionFile, InputInterface $input, Outp
 
 	private function doGeneration(ClassDefinition $definition, string $definitionFile, InputInterface $input, OutputInterface $output, bool $readonly): void {
 		$classGenerator = new ClassGenerator();
-		$generatedClass = $classGenerator->generateClass($definition);
-
-		$code = '<?php declare(strict_types = 1);'
-			. "\n\n"
-			. \sprintf(
-				\implode("\n", [
-					'/**',
-					' * Do not edit. This is generated file. Modify definition "%s" instead.',
-					' */',
-				]),
-				\pathinfo($definitionFile, \PATHINFO_BASENAME)
-			)
-			. "\n\n"
-			. $generatedClass;
+		$generatedFile = $classGenerator->generateClass($definition);
+
+		$generatedFile->addComment(\sprintf(
+			\implode("\n", [
+				'/**',
+				' * Do not edit. This is generated file. Modify definition "%s" instead.',
+				' */',
+			]),
+			\pathinfo($definitionFile, \PATHINFO_BASENAME)
+		));
+
+		$code = (string) $generatedFile;
 
 		$targetPath = Path::join(
 			Path::getDirectory($definitionFile),

tests/KeepAnnotatedMethodsDecorator/Stub/StubKeepMethod.overwritten.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace Grifart\ClassScaffolder\Test\KeepAnnotatedMethodsDecorator\Stub;
 
 use Grifart\ClassScaffolder\Definition\ClassDefinition;

tests/KeepAnnotatedMethodsDecorator/Stub/StubKeepMethod.preserved.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace Grifart\ClassScaffolder\Test\KeepAnnotatedMethodsDecorator\Stub;
 
 use Grifart\ClassScaffolder\Definition\ClassDefinition;

tests/KeepMethodDecorator/Stub/StubKeepMethod.overwritten.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace Grifart\ClassScaffolder\Test\KeepMethodDecorator\Stub;
 
 use Grifart\ClassScaffolder\Definition\ClassDefinition;

tests/KeepMethodDecorator/Stub/StubKeepMethod.preserved.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace Grifart\ClassScaffolder\Test\KeepMethodDecorator\Stub;
 
 use Grifart\ClassScaffolder\Definition\ClassDefinition;

tests/KeepUseStatementsDecorator/Stub/StubKeepUses.fromCurrent.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace Grifart\ClassScaffolder\Test\KeepUseStatementsDecorator\Stub;
 
 use Grifart\ClassScaffolder\Definition\ClassDefinitionBuilder;

tests/KeepUseStatementsDecorator/Stub/StubKeepUses.noCurrent.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace Grifart\ClassScaffolder\Test\KeepUseStatementsDecorator\Stub;
 
 use Grifart\ClassScaffolder\Definition\Field;

tests/basic-test/classGenerator.1-simple.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.10-promoted-properties.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.11-union-with-generics.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.11-union.phps

@@ -1,6 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS
 {
-	private GenericClass|int|callable|string|null $union;
+	private GenericClass|int|string|null $union;
 }

tests/basic-test/classGenerator.12-shape.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.13-intersection.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 use Countable;

tests/basic-test/classGenerator.14-readonly.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.15-builder-bc-api.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 use Iterator;

tests/basic-test/classGenerator.16-immutable-setters.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.17-named-constructor.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.2-with-iterator.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 use Iterator;

tests/basic-test/classGenerator.3-with-field.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.4-with-field-nullable.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.5-with-list.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.6-with-complex-collection.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 use Grifart\ClassScaffolder\Definition\ClassDefinition;

tests/basic-test/classGenerator.7-setters.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.8-generics.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.9-cross-reference.phps

@@ -1,3 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
 namespace NS;
 
 final class CLS

tests/basic-test/classGenerator.phpt

@@ -116,7 +116,7 @@ require_once __DIR__ . '/../bootstrap.php';
 		yield [
 			'classGenerator.11-union.phps',
 			(new ClassDefinition('NS\\CLS'))
-				->withField('union', Types\union(Types\classType('NS\GenericClass'), 'int', 'callable', 'string', 'null'))
+				->withField('union', Types\union(Types\classType('NS\GenericClass'), 'int', 'string', 'null'))
 				->with(properties()),
 		];