added setType()/getType()/hasStrictTypes()/hasBracketedSyntax()/isReturnNullable() as replacement for setTypeHint()/getTypeHint()/getStrictTypes()/getBracketedSyntax()/getReturnNullable()

Author: dg

readme.md

@@ -104,7 +104,7 @@ $method = $class->addMethod('count')
 
 $method->addParameter('items', []) // $items = []
 		->setReference() // &$items = []
-		->setTypeHint('array'); // array &$items = []
+		->setType('array'); // array &$items = []
 ```
 
 It results in:
@@ -138,7 +138,7 @@ $method = $class->addMethod('getValue')
 	->setBody('return count($this->items);');
 
 $method->addParameter('id')
-		->setTypeHint('int') // scalar type hint
+		->setType('int') // scalar type hint
 		->setNullable(); // nullable type hint
 
 echo $class;
@@ -431,7 +431,7 @@ $class->addImplement('Foo\A') // it will resolve to A
 $method = $class->addMethod('method');
 $method->addComment('@return ' . $namespace->unresolveName('Foo\D')); // in comments resolve manually
 $method->addParameter('arg')
-	->setTypeHint('Bar\OtherClass'); // it will resolve to \Bar\OtherClass
+	->setType('Bar\OtherClass'); // it will resolve to \Bar\OtherClass
 
 echo $namespace;
 

src/PhpGenerator/Factory.php

@@ -107,7 +107,7 @@ public function fromParameterReflection(\ReflectionParameter $from): Parameter
 	{
 		$param = new Parameter($from->getName());
 		$param->setReference($from->isPassedByReference());
-		$param->setTypeHint($from->hasType() ? $from->getType()->getName() : null);
+		$param->setType($from->hasType() ? $from->getType()->getName() : null);
 		$param->setNullable($from->hasType() && $from->getType()->allowsNull());
 		if ($from->isDefaultValueAvailable()) {
 			$param->setDefaultValue($from->isDefaultValueConstant()

src/PhpGenerator/Parameter.php

@@ -26,7 +26,7 @@ final class Parameter
 	private $reference = false;
 
 	/** @var string|null */
-	private $typeHint;
+	private $type;
 
 	/** @var bool */
 	private $nullable = false;
@@ -57,16 +57,31 @@ public function isReference(): bool
 	/**
 	 * @return static
 	 */
-	public function setTypeHint(?string $hint): self
+	public function setType(?string $type): self
 	{
-		$this->typeHint = $hint;
+		$this->type = $type;
 		return $this;
 	}
 
 
+	public function getType(): ?string
+	{
+		return $this->type;
+	}
+
+
+	/** @deprecated  use setType() */
+	public function setTypeHint(?string $type): self
+	{
+		$this->type = $type;
+		return $this;
+	}
+
+
+	/** @deprecated  use getType() */
 	public function getTypeHint(): ?string
 	{
-		return $this->typeHint;
+		return $this->type;
 	}
 
 

src/PhpGenerator/PhpFile.php

@@ -98,6 +98,13 @@ public function setStrictTypes(bool $on = true): self
 	}
 
 
+	public function hasStrictTypes(): bool
+	{
+		return $this->strictTypes;
+	}
+
+
+	/** @deprecated  use hasStrictTypes() */
 	public function getStrictTypes(): bool
 	{
 		return $this->strictTypes;

src/PhpGenerator/PhpNamespace.php

@@ -70,6 +70,13 @@ public function setBracketedSyntax(bool $state = true): self
 	}
 
 
+	public function hasBracketedSyntax(): bool
+	{
+		return $this->bracketedSyntax;
+	}
+
+
+	/** @deprecated  use hasBracketedSyntax() */
 	public function getBracketedSyntax(): bool
 	{
 		return $this->bracketedSyntax;

src/PhpGenerator/Printer.php

@@ -149,7 +149,7 @@ public function printNamespace(PhpNamespace $namespace): string
 		$body = ($uses ? $uses . "\n\n" : '')
 			. implode("\n", $classes);
 
-		if ($namespace->getBracketedSyntax()) {
+		if ($namespace->hasBracketedSyntax()) {
 			return 'namespace' . ($name ? " $name" : '') . "\n{\n"
 				. $this->indent($body)
 				. "}\n";
@@ -172,7 +172,7 @@ public function printFile(PhpFile $file): string
 			"<?php\n"
 			. ($file->getComment() ? "\n" . Helpers::formatDocComment($file->getComment() . "\n") : '')
 			. "\n"
-			. ($file->getStrictTypes() ? "declare(strict_types=1);\n\n" : '')
+			. ($file->hasStrictTypes() ? "declare(strict_types=1);\n\n" : '')
 			. implode("\n\n", $namespaces)
 		) . "\n";
 	}
@@ -226,8 +226,8 @@ protected function printParameters($function, ?PhpNamespace $namespace): string
 		$list = $function->getParameters();
 		foreach ($list as $param) {
 			$variadic = $function->isVariadic() && $param === end($list);
-			$hint = $param->getTypeHint();
-			$params[] = ($hint ? ($param->isNullable() ? '?' : '') . ($this->resolveTypes && $namespace ? $namespace->unresolveName($hint) : $hint) . ' ' : '')
+			$type = $param->getType();
+			$params[] = ($type ? ($param->isNullable() ? '?' : '') . ($this->resolveTypes && $namespace ? $namespace->unresolveName($type) : $type) . ' ' : '')
 				. ($param->isReference() ? '&' : '')
 				. ($variadic ? '...' : '')
 				. '$' . $param->getName()
@@ -246,7 +246,7 @@ protected function printParameters($function, ?PhpNamespace $namespace): string
 	protected function printReturnType($function, ?PhpNamespace $namespace): string
 	{
 		return $function->getReturnType()
-			? ': ' . ($function->getReturnNullable() ? '?' : '') . ($this->resolveTypes && $namespace ? $namespace->unresolveName($function->getReturnType()) : $function->getReturnType())
+			? ': ' . ($function->isReturnNullable() ? '?' : '') . ($this->resolveTypes && $namespace ? $namespace->unresolveName($function->getReturnType()) : $function->getReturnType())
 			: '';
 	}
 }

src/PhpGenerator/Traits/FunctionLike.php

@@ -172,6 +172,13 @@ public function setReturnNullable(bool $state = true): self
 	}
 
 
+	public function isReturnNullable(): bool
+	{
+		return $this->returnNullable;
+	}
+
+
+	/** @deprecated  use isReturnNullable() */
 	public function getReturnNullable(): bool
 	{
 		return $this->returnNullable;

tests/PhpGenerator/ClassType.phpt

@@ -89,7 +89,7 @@ $m->addParameter('mode', new PhpLiteral('self::ORDER'));
 Assert::false($m->isFinal());
 Assert::true($m->isStatic());
 Assert::true($m->getReturnReference());
-Assert::false($m->getReturnNullable());
+Assert::false($m->isReturnNullable());
 Assert::null($m->getReturnType());
 Assert::same('protected', $m->getVisibility());
 
@@ -103,7 +103,7 @@ $method->addParameter('item');
 
 $method->addParameter('res', null)
 		->setReference(true)
-		->setTypeHint('array');
+		->setType('array');
 
 sameFile(__DIR__ . '/expected/ClassType.expect', (string) $class);
 

tests/PhpGenerator/Method.longParams.phpt

@@ -11,7 +11,7 @@ $method = (new Method('create'))
 	->setBody('return null;');
 
 for ($name = 'a'; $name < 'm'; $name++) {
-	$method->addParameter($name)->setTypeHint('string');
+	$method->addParameter($name)->setType('string');
 }
 
 same(

tests/PhpGenerator/Method.scalarParameters.phpt

@@ -22,24 +22,24 @@ interface Foo
 }
 
 $method = Method::from(Foo::class . '::scalars');
-Assert::same('string', $method->getParameters()['a']->getTypeHint());
+Assert::same('string', $method->getParameters()['a']->getType());
 
 $method = Method::from(Foo::class . '::scalars');
-Assert::same('bool', $method->getParameters()['b']->getTypeHint());
+Assert::same('bool', $method->getParameters()['b']->getType());
 
 $method = Method::from(Foo::class . '::scalars');
-Assert::same('int', $method->getParameters()['c']->getTypeHint());
+Assert::same('int', $method->getParameters()['c']->getType());
 
 $method = Method::from(Foo::class . '::scalars');
-Assert::same('float', $method->getParameters()['d']->getTypeHint());
+Assert::same('float', $method->getParameters()['d']->getType());
 
 
 // generating methods with scalar type hints
 
 $method = (new Method('create'))
 	->setBody('return null;');
-$method->addParameter('a')->setTypeHint('string');
-$method->addParameter('b')->setTypeHint('bool');
+$method->addParameter('a')->setType('string');
+$method->addParameter('b')->setType('bool');
 
 same(
 'function create(string $a, bool $b)