improved phpDoc types

Author: dg

src/PhpGenerator/ClassLike.php

@@ -35,6 +35,7 @@ abstract class ClassLike
 	private ?string $name;
 
 
+	/** @param class-string|object  $class */
 	public static function from(string|object $class, bool $withBodies = false): static
 	{
 		$instance = (new Factory)
@@ -143,7 +144,7 @@ public function isEnum(): bool
 	}
 
 
-	/** @param  string[]  $names */
+	/** @param list<string>  $names */
 	protected function validateNames(array $names): void
 	{
 		foreach ($names as $name) {

src/PhpGenerator/ClassManipulator.php

@@ -75,6 +75,7 @@ public function inheritMethod(string $name, bool $returnIfExists = false): Metho
 
 	/**
 	 * Implements all methods from the given interface or abstract class.
+	 * @param class-string  $name
 	 */
 	public function implement(string $name): void
 	{

src/PhpGenerator/ClassType.php

@@ -33,7 +33,7 @@ final class ClassType extends ClassLike
 	private ?string $extends = null;
 	private bool $readOnly = false;
 
-	/** @var string[] */
+	/** @var list<string> */
 	private array $implements = [];
 
 
@@ -101,9 +101,7 @@ public function getExtends(): ?string
 	}
 
 
-	/**
-	 * @param  string[]  $names
-	 */
+	/** @param list<string>  $names */
 	public function setImplements(array $names): static
 	{
 		$this->validateNames($names);
@@ -112,7 +110,7 @@ public function setImplements(array $names): static
 	}
 
 
-	/** @return string[] */
+	/** @return list<string> */
 	public function getImplements(): array
 	{
 		return $this->implements;

src/PhpGenerator/Closure.php

@@ -16,10 +16,11 @@ final class Closure
 	use Traits\FunctionLike;
 	use Traits\AttributeAware;
 
-	/** @var Parameter[] */
+	/** @var list<Parameter> */
 	private array $uses = [];
 
 
+	/** @param \Closure(): mixed  $closure */
 	public static function from(\Closure $closure): self
 	{
 		return (new Factory)->fromFunctionReflection(new \ReflectionFunction($closure));
@@ -34,7 +35,7 @@ public function __toString(): string
 
 	/**
 	 * Replaces all uses.
-	 * @param  Parameter[]  $uses
+	 * @param  list<Parameter>  $uses
 	 */
 	public function setUses(array $uses): static
 	{
@@ -44,7 +45,7 @@ public function setUses(array $uses): static
 	}
 
 
-	/** @return Parameter[] */
+	/** @return list<Parameter> */
 	public function getUses(): array
 	{
 		return $this->uses;

src/PhpGenerator/Dumper.php

@@ -271,6 +271,7 @@ private function dumpArguments(array $args, int $column, bool $named): string
 
 
 	/**
+	 * @param  class-string  $class
 	 * @param  mixed[]  $props
 	 * @internal
 	 */

src/PhpGenerator/EnumType.php

@@ -19,7 +19,7 @@ final class EnumType extends ClassLike
 	use Traits\MethodsAware;
 	use Traits\TraitsAware;
 
-	/** @var string[] */
+	/** @var list<string> */
 	private array $implements = [];
 
 	/** @var array<string, EnumCase> */
@@ -40,9 +40,7 @@ public function getType(): ?string
 	}
 
 
-	/**
-	 * @param  string[]  $names
-	 */
+	/** @param list<string>  $names */
 	public function setImplements(array $names): static
 	{
 		$this->validateNames($names);
@@ -51,7 +49,7 @@ public function setImplements(array $names): static
 	}
 
 
-	/** @return string[] */
+	/** @return list<string> */
 	public function getImplements(): array
 	{
 		return $this->implements;
@@ -75,7 +73,7 @@ public function removeImplement(string $name): static
 
 	/**
 	 * Sets cases to enum
-	 * @param  EnumCase[]  $cases
+	 * @param  list<EnumCase>  $cases
 	 */
 	public function setCases(array $cases): static
 	{
@@ -89,7 +87,7 @@ public function setCases(array $cases): static
 	}
 
 
-	/** @return EnumCase[] */
+	/** @return array<string, EnumCase> */
 	public function getCases(): array
 	{
 		return $this->cases;

src/PhpGenerator/Extractor.php

@@ -24,7 +24,7 @@ final class Extractor
 {
 	private string $code;
 
-	/** @var Node[] */
+	/** @var array<Node> */
 	private array $statements;
 	private PhpParser\PrettyPrinterAbstract $printer;
 

src/PhpGenerator/Factory.php

@@ -18,10 +18,10 @@
  */
 final class Factory
 {
-	/** @var string[][]  */
+	/** @var array<string, array<string, string>> */
 	private array $bodyCache = [];
 
-	/** @var Extractor[]  */
+	/** @var array<string, Extractor> */
 	private array $extractorCache = [];
 
 
@@ -220,6 +220,7 @@ public function fromFunctionReflection(\ReflectionFunction $from, bool $withBody
 	}
 
 
+	/** @param callable(): mixed  $from */
 	public function fromCallable(callable $from): Method|GlobalFunction|Closure
 	{
 		$ref = Nette\Utils\Callback::toReflection($from);
@@ -366,7 +367,10 @@ public function fromCode(string $code): PhpFile
 	}
 
 
-	/** @return Attribute[] */
+	/**
+	 * @param  list<\ReflectionAttribute<object>>  $attrs
+	 * @return list<Attribute>
+	 */
 	private function formatAttributes(array $attrs): array
 	{
 		$res = [];

src/PhpGenerator/GlobalFunction.php

@@ -20,6 +20,7 @@ final class GlobalFunction
 	use Traits\CommentAware;
 	use Traits\AttributeAware;
 
+	/** @param string|(\Closure(): mixed)  $function */
 	public static function from(string|\Closure $function, bool $withBody = false): self
 	{
 		return (new Factory)->fromFunctionReflection(Nette\Utils\Callback::toReflection($function), $withBody);

src/PhpGenerator/Helpers.php

@@ -60,6 +60,7 @@ public static function formatDocComment(string $content, bool $forceMultiLine =
 	}
 
 
+	/** @param  PhpNamespace::Name*  $of */
 	public static function tagName(string $name, string $of = PhpNamespace::NameNormal): string
 	{
 		return isset(self::Keywords[strtolower($name)])
@@ -127,6 +128,7 @@ public static function tabsToSpaces(string $s, int $count = 4): string
 
 
 	/**
+	 * @param  class-string  $class
 	 * @param  mixed[]  $props
 	 * @internal
 	 */