Code style fixes

sunkan · sunkan · commit 387dfe673d6f · 2024-07-25T10:01:58.000+02:00
diff --git a/src/CodeHelper/ArrayCode.php b/src/CodeHelper/ArrayCode.php
@@ -51,12 +51,13 @@ public function getSourceArray(): array
 				foreach ($formattedValue as $z) {
 					$rows[] = $z;
 				}
-				$rows[] = $lastValue .',';
+				$rows[] = $lastValue . ',';
 				continue;
 			}
 
 			$formattedValue = FormatValue::format($value);
-			if ($value instanceof CodeInterface &&
+			if (
+				$value instanceof CodeInterface &&
 				is_array($formattedValue) &&
 				count($formattedValue) === 1 &&
 				is_string($formattedValue[0])
@@ -85,7 +86,7 @@ public function getSourceArray(): array
 			}
 			elseif (is_string($formattedValue)) {
 				$rows[] = sprintf(
-					"%s,",
+					'%s,',
 					$formattedValue
 				);
 			}
diff --git a/src/CodeHelper/CastCode.php b/src/CodeHelper/CastCode.php
@@ -32,7 +32,7 @@ public function __construct(
 	public function getSourceArray(): array
 	{
 		return [
-			'(' . $this->castType .')' . $this->reference->toString(),
+			'(' . $this->castType . ')' . $this->reference->toString(),
 		];
 	}
 }
diff --git a/src/CodeHelper/ClassMethodCall.php b/src/CodeHelper/ClassMethodCall.php
@@ -20,7 +20,7 @@ public static function this(string $method, array $params = []): self
 	public function __construct(
 		private VariableReference $class,
 		private string $method,
-		private array $params = []
+		private array $params = [],
 	) {
 		$this->identifier = $class->toString();
 	}
diff --git a/src/CodeHelper/MethodCallInterface.php b/src/CodeHelper/MethodCallInterface.php
@@ -4,5 +4,4 @@
 
 interface MethodCallInterface
 {
-
 }
diff --git a/src/CodeHelper/StaticMethodCall.php b/src/CodeHelper/StaticMethodCall.php
@@ -16,7 +16,7 @@ final class StaticMethodCall implements CodeInterface, MethodCallInterface
 	public function __construct(
 		protected Identifier|string $class,
 		protected string $method,
-		protected array $params = []
+		protected array $params = [],
 	) {
 		$this->identifier = Identifier::fromUnknown($class)->getName();
 		$this->callIdentifier = '::';
diff --git a/src/PhpDocElement.php b/src/PhpDocElement.php
@@ -9,7 +9,7 @@
  *
  * @author Fredrik Wallgren <fredrik.wallgren@gmail.com>
  * @author Andreas Sundqvist <andreas@stefna.is>
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license http://www.opensource.org/licenses/mit-license.php MIT License
  */
 class PhpDocElement
 {
@@ -19,7 +19,7 @@ public function __construct(
 		private string $type,
 		string|Type $dataType,
 		private string $variableName,
-		private string $description
+		private string $description,
 	) {
 		$this->datatype = is_string($dataType) ? Type::fromString($dataType) : $dataType;
 	}
diff --git a/src/PhpFunction.php b/src/PhpFunction.php
@@ -28,7 +28,7 @@ public function __construct(
 		array $params,
 		protected array|CodeInterface $body,
 		protected ?Type $returnTypeHint = null,
-		protected ?PhpDocComment $comment = null
+		protected ?PhpDocComment $comment = null,
 	) {
 		$this->identifier = Identifier::fromUnknown($identifier);
 		foreach ($params as $param) {
diff --git a/src/PhpInterface.php b/src/PhpInterface.php
@@ -65,7 +65,7 @@ public function addVariable(PhpVariable $variable, bool $forcePublic = false): s
 		return parent::addVariable($variable);
 	}
 
-	public static function fromClass(Identifier $identifier, PhpClass  $class): self
+	public static function fromClass(Identifier $identifier, PhpClass $class): self
 	{
 		$interface = new self($identifier);
 		$interface->uses = $class->uses;
diff --git a/src/PhpMethod.php b/src/PhpMethod.php
@@ -219,7 +219,8 @@ public function setParent(PhpTrait|PhpInterface|PhpClass $parent): static
 		if ($this->constructorAutoAssign) {
 			foreach ($this->params as $param) {
 				$var = $param->getVariable();
-				if ($var &&
+				if (
+					$var &&
 					!$parent instanceof PhpInterface &&
 					!$parent->hasVariable($var->getIdentifier())
 				) {
diff --git a/src/PhpParam.php b/src/PhpParam.php
@@ -64,7 +64,8 @@ public function getParent(): PhpFunction|PhpMethod|null
 	public function setParent(PhpFunction|PhpMethod $parent): void
 	{
 		$this->parent = $parent;
-		if ($this->variable &&
+		if (
+			$this->variable &&
 			$parent instanceof PhpMethod &&
 			$parent->doConstructorAutoAssign()
 		) {
diff --git a/src/PhpStan/ExtendsField.php b/src/PhpStan/ExtendsField.php
@@ -16,7 +16,7 @@ final class ExtendsField extends PhpDocElement implements HasIdentifiers
 
 	public function __construct(
 		private Identifier $extends,
-		TemplateField|Identifier ...$templateFields
+		TemplateField|Identifier ...$templateFields,
 	) {
 		parent::__construct('extends', Type::empty(), '', '');
 		$this->templateFields = $templateFields;
diff --git a/src/PhpStan/GenericSourceTrait.php b/src/PhpStan/GenericSourceTrait.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace Stefna\PhpCodeBuilder\PhpStan;
 
diff --git a/src/PhpStan/ImplementsField.php b/src/PhpStan/ImplementsField.php
@@ -16,7 +16,7 @@ final class ImplementsField extends PhpDocElement implements HasIdentifiers
 
 	public function __construct(
 		private Identifier $implement,
-		TemplateField|Identifier ...$templateFields
+		TemplateField|Identifier ...$templateFields,
 	) {
 		parent::__construct('implements', Type::empty(), '', '');
 		$this->templateFields = $templateFields;
diff --git a/src/Renderer/Php74Renderer.php b/src/Renderer/Php74Renderer.php
@@ -18,7 +18,8 @@ public function renderVariable(PhpVariable $variable, ?PhpTrait $parent = null):
 		Type::setInvalidReturnTypes($this->invalidReturnTypes);
 		$ret = [];
 
-		if ($variable->getType()->isNullable() &&
+		if (
+			$variable->getType()->isNullable() &&
 			$variable->getInitializedValue() === PhpVariable::NO_VALUE &&
 			$variable->getType()->getTypeHint() &&
 			$variable->getType()->getType() !== 'mixed'
diff --git a/src/Renderer/Php8Renderer.php b/src/Renderer/Php8Renderer.php
@@ -89,7 +89,8 @@ public function renderParams(PhpFunction $function, PhpParam ...$params): array|
 	{
 		$multiLine = false;
 		$includeVariableAttributes = false;
-		if ($function instanceof PhpMethod &&
+		if (
+			$function instanceof PhpMethod &&
 			$function->isConstructor() &&
 			$function->doConstructorAutoAssign()
 		) {
@@ -205,7 +206,8 @@ public function renderMethod(PhpMethod $method): array
 		$ret = $this->renderFunction($method);
 
 		if ($method->isConstructor()) {
-			if (is_array($ret[array_key_last($ret) - 1]) &&
+			if (
+				is_array($ret[array_key_last($ret) - 1]) &&
 				count($ret[array_key_last($ret) - 1]) === 0
 			) {
 				unset($ret[array_key_last($ret) - 1]);
@@ -249,7 +251,7 @@ protected function renderPromotedPropertyModifiers(
 	public function renderAttribute(PhpAttribute $attr): array
 	{
 		$args = $attr->getArgs();
-		$start = '#['.$attr->getIdentifier()->toString();
+		$start = '#[' . $attr->getIdentifier()->toString();
 		if (!$args) {
 			return [
 				$start . ']',
@@ -262,7 +264,7 @@ public function renderAttribute(PhpAttribute $attr): array
 			$argString = implode(',' . PHP_EOL, $args);
 		}
 		return [
-			$start.'(' . $argString . ')]',
+			$start . '(' . $argString . ')]',
 		];
 	}
 
diff --git a/tests/CodeHelper/ArrayCodeTest.php b/tests/CodeHelper/ArrayCodeTest.php
@@ -15,7 +15,7 @@ public function testSimpleAssocArray(): void
 	{
 		$array = new ArrayCode([
 			'test1' => 2,
-			'test2' => "string",
+			'test2' => 'string',
 			'test3' => true,
 		]);
 
@@ -30,7 +30,7 @@ public function testCustomIndentLevel(): void
 	{
 		$array = new ArrayCode([
 			'test1' => 2,
-			'test2' => "string",
+			'test2' => 'string',
 			'test3' => true,
 		]);
 
@@ -49,7 +49,7 @@ public function testNestedAssocArray(): void
 	{
 		$array = new ArrayCode([
 			'test1' => 2,
-			'test2' => "string",
+			'test2' => 'string',
 			'test3' => true,
 			'test4' => [
 				'sub1' => 'test',
@@ -117,9 +117,9 @@ public function testListOfVariable(): void
 			$var,
 		]);
 
-		$this->assertSame("[
-	\$this->testVar,
-]", trim(FlattenSource::source($array->getSourceArray())));
+		$this->assertSame('[
+	$this->testVar,
+]', trim(FlattenSource::source($array->getSourceArray())));
 	}
 
 	public function testListOfTypes(): void
diff --git a/tests/CodeHelper/InstantiateClassTest.php b/tests/CodeHelper/InstantiateClassTest.php
@@ -65,8 +65,8 @@ public function testMixedParamsInInstantiateClass(): void
 		$this->assertSame([
 			'new self(',
 			[
-				"DateTimeImmutable::class,",
-				"EnumCase::class,",
+				'DateTimeImmutable::class,',
+				'EnumCase::class,',
 				'[',
 				[
 					"'id',",
diff --git a/tests/CodeHelper/Methods/ComplexTypeWithJsonSerialize.php b/tests/CodeHelper/Methods/ComplexTypeWithJsonSerialize.php
@@ -4,7 +4,6 @@
 
 final class ComplexTypeWithJsonSerialize implements \JsonSerializable
 {
-
 	public function jsonSerialize(): string
 	{
 		return 'complexType';
diff --git a/tests/CodeHelper/ReturnCodeTest.php b/tests/CodeHelper/ReturnCodeTest.php
@@ -27,7 +27,7 @@ public function testArray(): void
 	{
 		$array = new ReturnCode(new ArrayCode([
 			'test1' => 2,
-			'test2' => "string",
+			'test2' => 'string',
 			'test3' => true,
 		]));
 
diff --git a/tests/CodeHelper/VariableReferenceTest.php b/tests/CodeHelper/VariableReferenceTest.php
@@ -19,6 +19,6 @@ public function testArrayVariableWithDynamicKey(): void
 		$key = new VariableReference('key');
 		$var = VariableReference::array('input', $key);
 
-		$this->assertSame("\$input[\$key]", $var->toString());
+		$this->assertSame('$input[$key]', $var->toString());
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,13 @@ public function getSourceArray(): array`
`51`	`51`	`foreach ($formattedValue as $z) {`
`52`	`52`	`$rows[] = $z;`
`53`	`53`	`}`
`54`		`- $rows[] = $lastValue .',';`
	`54`	`+ $rows[] = $lastValue . ',';`
`55`	`55`	`continue;`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`$formattedValue = FormatValue::format($value);`
`59`		`- if ($value instanceof CodeInterface &&`
	`59`	`+ if (`
	`60`	`+ $value instanceof CodeInterface &&`
`60`	`61`	`is_array($formattedValue) &&`
`61`	`62`	`count($formattedValue) === 1 &&`
`62`	`63`	`is_string($formattedValue[0])`
`@@ -85,7 +86,7 @@ public function getSourceArray(): array`
`85`	`86`	`}`
`86`	`87`	`elseif (is_string($formattedValue)) {`
`87`	`88`	`$rows[] = sprintf(`
`88`		`- "%s,",`
	`89`	`+ '%s,',`
`89`	`90`	`$formattedValue`
`90`	`91`	`);`
`91`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function __construct(`
`32`	`32`	`public function getSourceArray(): array`
`33`	`33`	`{`
`34`	`34`	`return [`
`35`		`- '(' . $this->castType .')' . $this->reference->toString(),`
	`35`	`+ '(' . $this->castType . ')' . $this->reference->toString(),`
`36`	`36`	`];`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static function this(string $method, array $params = []): self`
`20`	`20`	`public function __construct(`
`21`	`21`	`private VariableReference $class,`
`22`	`22`	`private string $method,`
`23`		`- private array $params = []`
	`23`	`+ private array $params = [],`
`24`	`24`	`) {`
`25`	`25`	`$this->identifier = $class->toString();`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,4 @@`
`4`	`4`
`5`	`5`	`interface MethodCallInterface`
`6`	`6`	`{`
`7`		`-`
`8`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* @author Fredrik Wallgren <fredrik.wallgren@gmail.com>`
`11`	`11`	`* @author Andreas Sundqvist <andreas@stefna.is>`
`12`		`- * @license http://www.opensource.org/licenses/mit-license.php MIT License`
	`12`	`+ * @license http://www.opensource.org/licenses/mit-license.php MIT License`
`13`	`13`	`*/`
`14`	`14`	`class PhpDocElement`
`15`	`15`	`{`
`@@ -19,7 +19,7 @@ public function __construct(`
`19`	`19`	`private string $type,`
`20`	`20`	`string\|Type $dataType,`
`21`	`21`	`private string $variableName,`
`22`		`- private string $description`
	`22`	`+ private string $description,`
`23`	`23`	`) {`
`24`	`24`	`$this->datatype = is_string($dataType) ? Type::fromString($dataType) : $dataType;`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function addVariable(PhpVariable $variable, bool $forcePublic = false): s`
`65`	`65`	`return parent::addVariable($variable);`
`66`	`66`	`}`
`67`	`67`
`68`		`- public static function fromClass(Identifier $identifier, PhpClass $class): self`
	`68`	`+ public static function fromClass(Identifier $identifier, PhpClass $class): self`
`69`	`69`	`{`
`70`	`70`	`$interface = new self($identifier);`
`71`	`71`	`$interface->uses = $class->uses;`