ClassType::setConstants() and setTraits() accepts array of Constant resp TraitUse only (BC break)

Author: dg

src/PhpGenerator/ClassType.php

@@ -307,14 +307,15 @@ public function removeImplement(string $name): static
 
 
 	/**
-	 * @param  string[]|TraitUse[]  $traits
+	 * @param  TraitUse[]  $traits
 	 */
 	public function setTraits(array $traits): static
 	{
 		(function (TraitUse|string ...$traits) {})(...$traits);
 		$this->traits = [];
 		foreach ($traits as $trait) {
 			if (!$trait instanceof TraitUse) {
+				trigger_error(__METHOD__ . '() accepts an array of TraitUse as parameter, string given.', E_USER_DEPRECATED);
 				$trait = new TraitUse($trait);
 			}
 
@@ -372,13 +373,14 @@ public function addMember(Method|Property|Constant|EnumCase|TraitUse $member): s
 
 
 	/**
-	 * @param  Constant[]|mixed[]  $consts
+	 * @param  Constant[]  $consts
 	 */
 	public function setConstants(array $consts): static
 	{
 		$this->consts = [];
 		foreach ($consts as $k => $const) {
 			if (!$const instanceof Constant) {
+				trigger_error(__METHOD__ . '() accepts an array of Constant as parameter, ' . get_debug_type($const) . ' given.', E_USER_DEPRECATED);
 				$const = (new Constant($k))->setValue($const)->setPublic();
 			}
 

tests/PhpGenerator/ClassType.enum.phpt

@@ -17,11 +17,11 @@ $enum = ClassType::enum('Suit');
 
 Assert::true($enum->isEnum());
 
-$enum
-	->setTraits(['ObjectTrait'])
-	->addComment("Description of class.\nThis is example\n")
-	->addAttribute('ExampleAttribute')
-	->addConstant('ACTIVE', false);
+$enum->addComment("Description of class.\nThis is example\n")
+	->addAttribute('ExampleAttribute');
+
+$enum->addConstant('ACTIVE', false);
+$enum->addTrait('ObjectTrait');
 
 $enum->addMethod('foo')
 	->setBody('return 10;');

tests/PhpGenerator/ClassType.phpt

@@ -31,13 +31,15 @@ $class
 	->setExtends('ParentClass')
 	->addImplement('IExample')
 	->addImplement('IOne')
-	->setTraits(['ObjectTrait'])
-	->addTrait('AnotherTrait', ['sayHello as protected'])
 	->addComment("Description of class.\nThis is example\n /**/")
-	->addComment('@property-read Nette\Forms\Form $form')
-	->setConstants(['ROLE' => 'admin'])
-	->addConstant('ACTIVE', false)
-		->setFinal();
+	->addComment('@property-read Nette\Forms\Form $form');
+
+$class->addTrait('ObjectTrait');
+$class->addTrait('AnotherTrait', ['sayHello as protected']);
+
+$class->addConstant('ROLE', 'admin');
+$class->addConstant('ACTIVE', false)
+	->setFinal();
 
 Assert::false($class->isFinal());
 Assert::true($class->isAbstract());

tests/PhpGenerator/Printer.namespace.phpt

@@ -21,9 +21,10 @@ $class = $namespace->addClass('A')
 	->setExtends('ParentClass')
 	->addImplement('IExample')
 	->addImplement('Foo\IOne')
-	->setTraits(['Foo\ObjectTrait'])
 	->addComment("Description of class.\nThis is example\n");
 
+$class->addTrait('Foo\ObjectTrait');
+
 $class->addMethod('first')
 	->addComment('@return resource')
 	->setFinal(true)

tests/PhpGenerator/Printer.phpt

@@ -18,10 +18,11 @@ $class = (new ClassType('Example'))
 	->setFinal(true)
 	->setExtends('ParentClass')
 	->addImplement('IExample')
-	->setTraits(['ObjectTrait'])
-	->addTrait('AnotherTrait', ['sayHello as protected'])
 	->addComment("Description of class.\nThis is example\n");
 
+$class->addTrait('ObjectTrait');
+$class->addTrait('AnotherTrait', ['sayHello as protected']);
+
 $class->addConstant('FORCE_ARRAY', new Literal('Nette\Utils\Json::FORCE_ARRAY'))
 	->setPrivate()
 	->addComment('Commented');

tests/PhpGenerator/PsrPrinter.phpt

@@ -17,10 +17,11 @@ $class = (new ClassType('Example'))
 	->setFinal(true)
 	->setExtends('ParentClass')
 	->addImplement('IExample')
-	->setTraits(['ObjectTrait'])
-	->addTrait('AnotherTrait', ['sayHello as protected'])
 	->addComment("Description of class.\nThis is example\n");
 
+$class->addTrait('ObjectTrait');
+$class->addTrait('AnotherTrait', ['sayHello as protected']);
+
 $class->addConstant('FORCE_ARRAY', new Literal('Nette\Utils\Json::FORCE_ARRAY'))
 	->setVisibility('private')
 	->addComment('Commented');

tests/PhpGenerator/invalidNames.phpt

@@ -108,10 +108,6 @@ Assert::exception(function () use ($class) {
 	$class->addImplement('*');
 }, Nette\InvalidArgumentException::class, "Value '*' is not valid class name.");
 
-Assert::exception(function () use ($class) {
-	$class->setTraits(['A', '*']);
-}, Nette\InvalidArgumentException::class, "Value '*' is not valid trait name.");
-
 Assert::exception(function () use ($class) {
 	$class->addTrait('*');
 }, Nette\InvalidArgumentException::class, "Value '*' is not valid trait name.");