Add failing test for array

.travis.yml

@@ -37,7 +37,7 @@ jobs:
             install:
                 - travis_retry composer create-project nette/coding-standard temp/coding-standard ^2 --no-progress
             script:
-                - php temp/coding-standard/ecs check src tests --config temp/coding-standard/coding-standard-php71.yml
+                - php temp/coding-standard/ecs check src tests --config tests/coding-standard.yml
 
 
         -   stage: Static Analysis (informative)

composer.json

@@ -3,7 +3,7 @@
 	"description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.4 features.",
 	"keywords": ["nette", "php", "code", "scaffolding"],
 	"homepage": "https://nette.org",
-	"license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
+	"license": ["BSD-3-Clause", "GPL-2.0-only", "GPL-3.0-only"],
 	"authors": [
 		{
 			"name": "David Grudl",

readme.md

@@ -43,9 +43,9 @@ $class = new Nette\PhpGenerator\ClassType('Demo');
 
 $class
 	->setFinal()
-	->setExtends('ParentClass')
-	->addImplement('Countable')
-	->addTrait('Nette\SmartObject')
+	->setExtends(ParentClass::class)
+	->addImplement(Countable::class)
+	->addTrait(Nette\SmartObject::class)
 	->addComment("Description of class.\nSecond line\n")
 	->addComment('@property-read Nette\Forms\Form $form');
 
@@ -78,7 +78,7 @@ We can add constants and properties:
 $class->addConstant('ID', 123);
 
 $class->addProperty('items', [1, 2, 3])
-	->setVisibility('private')
+	->setPrivate()
 	->setStatic()
 	->addComment('@var int[]');
 ```
@@ -99,7 +99,7 @@ $method = $class->addMethod('count')
 	->addComment('Count it.')
 	->addComment('@return int')
 	->setFinal()
-	->setVisibility('protected')
+	->setProtected()
 	->setBody('return count($items ?: $this->items);');
 
 $method->addParameter('items', []) // $items = []
@@ -127,23 +127,25 @@ Members can be removed using `removeProperty()`, `removeConstant()`, `removeMeth
 PHP Generator supports all new PHP 7.3 and 7.4 features:
 
 ```php
+use Nette\PhpGenerator\Type;
+
 $class = new Nette\PhpGenerator\ClassType('Demo');
 
 $class->addConstant('ID', 123)
-	->setVisibility('private'); // constant visiblity
+	->setPrivate(); // constant visiblity
 
 $class->addProperty('items')
-	->setType('array') // typed properites
+	->setType(Type::ARRAY) // typed properites
 	->setNullable()
 	->setInitialized();
 
 $method = $class->addMethod('getValue')
-	->setReturnType('int') // method return type
+	->setReturnType(Type::INT) // method return type
 	->setReturnNullable() // nullable return type
 	->setBody('return count($this->items);');
 
 $method->addParameter('id')
-		->setType('int') // scalar type hint
+		->setType(Type::ARRAY) // scalar type hint
 		->setNullable(); // nullable type hint
 
 echo $class;
@@ -205,17 +207,17 @@ It can be used also for functions, closures, namespaces etc.
 Literals
 --------
 
-You can pass any PHP code to property or parameter default values via `PhpLiteral`:
+You can pass any PHP code to property or parameter default values via `Literal`:
 
 ```php
-use Nette\PhpGenerator\PhpLiteral;
+use Nette\PhpGenerator\Literal;
 
 $class = new Nette\PhpGenerator\ClassType('Demo');
 
-$class->addProperty('foo', new PhpLiteral('Iterator::SELF_FIRST'));
+$class->addProperty('foo', new Literal('Iterator::SELF_FIRST'));
 
 $class->addMethod('bar')
-	->addParameter('id', new PhpLiteral('1 + 2'));
+	->addParameter('id', new Literal('1 + 2'));
 
 echo $class;
 ```
@@ -238,8 +240,8 @@ Interface or Trait
 
 ```php
 $class = new Nette\PhpGenerator\ClassType('DemoInterface');
-$class->setType('interface');
-// or $class->setType('trait');
+$class->setInterface();
+// or $class->setTrait();
 ```
 
 Trait Resolutions and Visibility
@@ -439,8 +441,8 @@ If the class already exists, it will be overwritten.
 You can define use-statements:
 
 ```php
-$namespace->addUse('Http\Request'); // use Http\Request;
-$namespace->addUse('Http\Request', 'HttpReq'); // use Http\Request as HttpReq;
+$namespace->addUse(Http\Request::class); // use Http\Request;
+$namespace->addUse(Http\Request::class, 'HttpReq'); // use Http\Request as HttpReq;
 ```
 
 **IMPORTANT NOTE:** when the class is part of the namespace, it is rendered slightly differently: all types (ie. type hints, return types, parent class name,

src/PhpGenerator/ClassType.php

@@ -97,19 +97,14 @@ public function __toString(): string
 	}
 
 
-	/**
-	 * Deprecated: an object can be in multiple namespaces.
-	 * @deprecated
-	 */
+	/** @deprecated  an object can be in multiple namespaces */
 	public function getNamespace(): ?PhpNamespace
 	{
 		return $this->namespace;
 	}
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
 	public function setName(?string $name): self
 	{
 		if ($name !== null && !Helpers::isIdentifier($name)) {
@@ -126,9 +121,49 @@ public function getName(): ?string
 	}
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
+	public function setClass(): self
+	{
+		$this->type = self::TYPE_CLASS;
+		return $this;
+	}
+
+
+	public function isClass(): bool
+	{
+		return $this->type === self::TYPE_CLASS;
+	}
+
+
+	/** @return static */
+	public function setInterface(): self
+	{
+		$this->type = self::TYPE_INTERFACE;
+		return $this;
+	}
+
+
+	public function isInterface(): bool
+	{
+		return $this->type === self::TYPE_INTERFACE;
+	}
+
+
+	/** @return static */
+	public function setTrait(): self
+	{
+		$this->type = self::TYPE_TRAIT;
+		return $this;
+	}
+
+
+	public function isTrait(): bool
+	{
+		return $this->type === self::TYPE_TRAIT;
+	}
+
+
+	/** @return static */
 	public function setType(string $type): self
 	{
 		if (!in_array($type, [self::TYPE_CLASS, self::TYPE_INTERFACE, self::TYPE_TRAIT], true)) {
@@ -145,9 +180,7 @@ public function getType(): string
 	}
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
 	public function setFinal(bool $state = true): self
 	{
 		$this->final = $state;
@@ -161,9 +194,7 @@ public function isFinal(): bool
 	}
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
 	public function setAbstract(bool $state = true): self
 	{
 		$this->abstract = $state;
@@ -192,18 +223,14 @@ public function setExtends($names): self
 	}
 
 
-	/**
-	 * @return string|string[]
-	 */
+	/** @return string|string[] */
 	public function getExtends()
 	{
 		return $this->extends;
 	}
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
 	public function addExtend(string $name): self
 	{
 		$this->validateNames([$name]);
@@ -225,18 +252,14 @@ public function setImplements(array $names): self
 	}
 
 
-	/**
-	 * @return string[]
-	 */
+	/** @return string[] */
 	public function getImplements(): array
 	{
 		return $this->implements;
 	}
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
 	public function addImplement(string $name): self
 	{
 		$this->validateNames([$name]);
@@ -257,27 +280,21 @@ public function setTraits(array $names): self
 	}
 
 
-	/**
-	 * @return string[]
-	 */
+	/** @return string[] */
 	public function getTraits(): array
 	{
 		return array_keys($this->traits);
 	}
 
 
-	/**
-	 * @internal
-	 */
+	/** @internal */
 	public function getTraitResolutions(): array
 	{
 		return $this->traits;
 	}
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
 	public function addTrait(string $name, array $resolutions = []): self
 	{
 		$this->validateNames([$name]);
@@ -293,7 +310,7 @@ public function addTrait(string $name, array $resolutions = []): self
 	public function addMember($member): self
 	{
 		if ($member instanceof Method) {
-			if ($this->type === self::TYPE_INTERFACE) {
+			if ($this->isInterface()) {
 				$member->setBody(null);
 			}
 			$this->methods[$member->getName()] = $member;
@@ -327,9 +344,7 @@ public function setConstants(array $consts): self
 	}
 
 
-	/**
-	 * @return Constant[]
-	 */
+	/** @return Constant[] */
 	public function getConstants(): array
 	{
 		return $this->consts;
@@ -342,9 +357,7 @@ public function addConstant(string $name, $value): Constant
 	}
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
 	public function removeConstant(string $name): self
 	{
 		unset($this->consts[$name]);
@@ -369,9 +382,7 @@ public function setProperties(array $props): self
 	}
 
 
-	/**
-	 * @return Property[]
-	 */
+	/** @return Property[] */
 	public function getProperties(): array
 	{
 		return $this->properties;
@@ -430,9 +441,7 @@ public function setMethods(array $methods): self
 	}
 
 
-	/**
-	 * @return Method[]
-	 */
+	/** @return Method[] */
 	public function getMethods(): array
 	{
 		return $this->methods;
@@ -451,18 +460,16 @@ public function getMethod(string $name): Method
 	public function addMethod(string $name): Method
 	{
 		$method = new Method($name);
-		if ($this->type === self::TYPE_INTERFACE) {
+		if ($this->isInterface()) {
 			$method->setBody(null);
 		} else {
-			$method->setVisibility(self::VISIBILITY_PUBLIC);
+			$method->setPublic();
 		}
 		return $this->methods[$name] = $method;
 	}
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
 	public function removeMethod(string $name): self
 	{
 		unset($this->methods[$name]);
@@ -476,9 +483,7 @@ public function hasMethod(string $name): bool
 	}
 
 
-	/**
-	 * @throws Nette\InvalidStateException
-	 */
+	/** @throws Nette\InvalidStateException */
 	public function validate(): void
 	{
 		if ($this->abstract && $this->final) {

src/PhpGenerator/Constant.php

@@ -26,9 +26,7 @@ final class Constant
 	private $value;
 
 
-	/**
-	 * @return static
-	 */
+	/** @return static */
 	public function setValue($val): self
 	{
 		$this->value = $val;