added Type

Author: dg

.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)

readme.md

@@ -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)
 	->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;

src/PhpGenerator/Type.php

@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\PhpGenerator;
+
+
+/**
+ * PHP return, property and parameter types.
+ */
+class Type
+{
+	public const
+		STRING = 'string',
+		INT = 'int',
+		FLOAT = 'float',
+		BOOL = 'bool',
+		ARRAY = 'array',
+		OBJECT = 'object',
+		CALLABLE = 'callable',
+		ITERABLE = 'iterable',
+		VOID = 'void',
+		NULL = 'null',
+		SELF = 'self',
+		PARENT = 'parent';
+
+
+	public static function nullable(string $type, bool $state = true): string
+	{
+		return ($state ? '?' : '') . ltrim($type, '?');
+	}
+
+
+	public static function union(string ...$types): string
+	{
+		return implode('|', $types);
+	}
+}

tests/PhpGenerator/ClassType.phpt

@@ -8,6 +8,7 @@ declare(strict_types=1);
 
 use Nette\PhpGenerator\ClassType;
 use Nette\PhpGenerator\PhpLiteral;
+use Nette\PhpGenerator\Type;
 use Tester\Assert;
 
 
@@ -57,10 +58,10 @@ $class->addProperty('order')
 	->setValue(new PhpLiteral('RecursiveIteratorIterator::SELF_FIRST'));
 
 $class->addProperty('typed1')
-	->setType('array');
+	->setType(Type::ARRAY);
 
 $class->addProperty('typed2')
-	->setType('array')
+	->setType(Type::ARRAY)
 	->setNullable()
 	->setInitialized();
 
@@ -120,7 +121,7 @@ $method->addParameter('item');
 
 $method->addParameter('res', null)
 		->setReference(true)
-		->setType('array');
+		->setType(Type::ARRAY);
 
 sameFile(__DIR__ . '/expected/ClassType.expect', (string) $class);
 

tests/PhpGenerator/Method.scalarParameters.phpt

@@ -8,6 +8,7 @@ declare(strict_types=1);
 
 
 use Nette\PhpGenerator\Method;
+use Nette\PhpGenerator\Type;
 use Tester\Assert;
 
 
@@ -38,8 +39,8 @@ Assert::same('float', $method->getParameters()['d']->getType());
 
 $method = (new Method('create'))
 	->setBody('return null;');
-$method->addParameter('a')->setType('string');
-$method->addParameter('b')->setType('bool');
+$method->addParameter('a')->setType(Type::STRING);
+$method->addParameter('b')->setType(Type::BOOL);
 
 same(
 'function create(string $a, bool $b)

tests/PhpGenerator/Type.phpt

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Nette\PhpGenerator\Type;
+use Tester\Assert;
+
+require __DIR__ . '/../bootstrap.php';
+
+
+Assert::same('A|string', Type::union(A::class, Type::STRING));
+
+Assert::same('?A', Type::nullable(A::class));
+Assert::same('?A', Type::nullable(A::class, true));
+Assert::same('A', Type::nullable(A::class, false));
+
+Assert::same('?A', Type::nullable('?A', true));
+Assert::same('A', Type::nullable('?A', false));

tests/coding-standard.yml

@@ -0,0 +1,7 @@
+imports:
+    - { resource: '../temp/coding-standard/coding-standard-php71.yml' }
+
+parameters:
+    skip:
+        PhpCsFixer\Fixer\Casing\LowercaseConstantsFixer:
+            - src/PhpGenerator/Type.php  # constant NULL