new deprecated stuff triggers warnings (BC break)

dg · dg · commit b357b90beeed · 2017-02-24T20:30:04.000+01:00
diff --git a/src/PhpGenerator/ClassType.php b/src/PhpGenerator/ClassType.php
@@ -68,6 +68,9 @@ class ClassType
 	 */
 	public static function from($class)
 	{
+		if ($class instanceof \ReflectionClass) {
+			trigger_error(__METHOD__ . '() accepts only class name or object.', E_USER_DEPRECATED);
+		}
 		return (new Factory)->fromClassReflection(
 			$class instanceof \ReflectionClass ? $class : new \ReflectionClass($class)
 		);
@@ -330,6 +333,7 @@ public function addTrait($trait, array $resolutions = [])
 	 */
 	public function setConsts(array $consts)
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use setConstants()', E_USER_DEPRECATED);
 		return $this->setConstants($consts);
 	}
 
@@ -340,6 +344,7 @@ public function setConsts(array $consts)
 	 */
 	public function getConsts()
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use similar getConstants()', E_USER_DEPRECATED);
 		return array_map(function ($const) { return $const->getValue(); }, $this->consts);
 	}
 
@@ -352,6 +357,7 @@ public function getConsts()
 	 */
 	public function addConst($name, $value)
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use similar addConstant()', E_USER_DEPRECATED);
 		$this->addConstant($name, $value);
 		return $this;
 	}
diff --git a/src/PhpGenerator/Method.php b/src/PhpGenerator/Method.php
@@ -41,7 +41,11 @@ class Method
 	 */
 	public static function from($method)
 	{
-		$method = $method instanceof \ReflectionMethod ? $method : Nette\Utils\Callback::toReflection($method);
+		if ($method instanceof \ReflectionMethod) {
+			trigger_error(__METHOD__ . '() accepts only method name.', E_USER_DEPRECATED);
+		} else {
+			$method = Nette\Utils\Callback::toReflection($method);
+		}
 		return (new Factory)->fromMethodReflection($method);
 	}
 
diff --git a/src/PhpGenerator/PhpNamespace.php b/src/PhpGenerator/PhpNamespace.php
@@ -59,6 +59,7 @@ public function __construct($name = NULL)
 	/** @deprecated */
 	public function setName($name)
 	{
+		trigger_error(__METHOD__ . '() is deprecated, use constructor.', E_USER_DEPRECATED);
 		$this->__construct($name);
 		return $this;
 	}
diff --git a/tests/PhpGenerator/ClassType.from.phpt b/tests/PhpGenerator/ClassType.from.phpt
@@ -9,6 +9,7 @@ declare(strict_types=1);
 namespace Abc;
 
 use Nette\PhpGenerator\ClassType;
+use Nette\PhpGenerator\Factory;
 use Tester\Assert;
 
 
@@ -71,9 +72,9 @@ class Class3
 $res[] = ClassType::from(Interface1::class);
 $res[] = ClassType::from(Interface2::class);
 $res[] = ClassType::from(Class1::class);
-$res[] = ClassType::from(new \ReflectionClass(Class2::class));
+$res[] = ClassType::from(new Class2);
 $obj = new Class3;
 $obj->prop2 = 1;
-$res[] = ClassType::from(new \ReflectionObject($obj));
+$res[] = (new Factory)->fromClassReflection(new \ReflectionObject($obj));
 
 Assert::matchFile(__DIR__ . '/ClassType.from.expect', implode("\n", $res));
diff --git a/tests/PhpGenerator/ClassType.from.trait.phpt b/tests/PhpGenerator/ClassType.from.trait.phpt
@@ -38,9 +38,9 @@ class Class2 extends Class1
 {
 }
 
-$res[] = ClassType::from(new ReflectionClass('Trait1'));
-$res[] = ClassType::from(new ReflectionClass('Trait2'));
-$res[] = ClassType::from(new ReflectionClass('Class1'));
-$res[] = ClassType::from(new ReflectionClass('Class2'));
+$res[] = ClassType::from('Trait1');
+$res[] = ClassType::from('Trait2');
+$res[] = ClassType::from('Class1');
+$res[] = ClassType::from('Class2');
 
 Assert::matchFile(__DIR__ . '/ClassType.from.trait.expect', implode("\n", $res));
diff --git a/tests/PhpGenerator/ClassType.phpt b/tests/PhpGenerator/ClassType.phpt
@@ -25,10 +25,8 @@ $class
 	->addTrait('AnotherTrait', ['sayHello as protected'])
 	->addComment("Description of class.\nThis is example\n")
 	->addComment('@property-read Nette\Forms\Form $form')
-	->setConsts(['ROLE' => 'admin'])
-	->addConst('ACTIVE', FALSE);
-
-Assert::same(['ROLE' => 'admin', 'ACTIVE' => FALSE], $class->getConsts());
+	->setConstants(['ROLE' => 'admin'])
+	->addConstant('ACTIVE', FALSE);
 
 $class->addConstant('FORCE_ARRAY', new PhpLiteral('Nette\Utils\Json::FORCE_ARRAY'))
 	->setVisibility('private')

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,9 @@ class ClassType`
`68`	`68`	`*/`
`69`	`69`	`public static function from($class)`
`70`	`70`	`{`
	`71`	`+ if ($class instanceof \ReflectionClass) {`
	`72`	`+ trigger_error(__METHOD__ . '() accepts only class name or object.', E_USER_DEPRECATED);`
	`73`	`+ }`
`71`	`74`	`return (new Factory)->fromClassReflection(`
`72`	`75`	`$class instanceof \ReflectionClass ? $class : new \ReflectionClass($class)`
`73`	`76`	`);`
`@@ -330,6 +333,7 @@ public function addTrait($trait, array $resolutions = [])`
`330`	`333`	`*/`
`331`	`334`	`public function setConsts(array $consts)`
`332`	`335`	`{`
	`336`	`+ trigger_error(__METHOD__ . '() is deprecated, use setConstants()', E_USER_DEPRECATED);`
`333`	`337`	`return $this->setConstants($consts);`
`334`	`338`	`}`
`335`	`339`
`@@ -340,6 +344,7 @@ public function setConsts(array $consts)`
`340`	`344`	`*/`
`341`	`345`	`public function getConsts()`
`342`	`346`	`{`
	`347`	`+ trigger_error(__METHOD__ . '() is deprecated, use similar getConstants()', E_USER_DEPRECATED);`
`343`	`348`	`return array_map(function ($const) { return $const->getValue(); }, $this->consts);`
`344`	`349`	`}`
`345`	`350`
`@@ -352,6 +357,7 @@ public function getConsts()`
`352`	`357`	`*/`
`353`	`358`	`public function addConst($name, $value)`
`354`	`359`	`{`
	`360`	`+ trigger_error(__METHOD__ . '() is deprecated, use similar addConstant()', E_USER_DEPRECATED);`
`355`	`361`	`$this->addConstant($name, $value);`
`356`	`362`	`return $this;`
`357`	`363`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,11 @@ class Method`
`41`	`41`	`*/`
`42`	`42`	`public static function from($method)`
`43`	`43`	`{`
`44`		`- $method = $method instanceof \ReflectionMethod ? $method : Nette\Utils\Callback::toReflection($method);`
	`44`	`+ if ($method instanceof \ReflectionMethod) {`
	`45`	`+ trigger_error(__METHOD__ . '() accepts only method name.', E_USER_DEPRECATED);`
	`46`	`+ } else {`
	`47`	`+ $method = Nette\Utils\Callback::toReflection($method);`
	`48`	`+ }`
`45`	`49`	`return (new Factory)->fromMethodReflection($method);`
`46`	`50`	`}`
`47`	`51`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,7 @@ public function __construct($name = NULL)`
`59`	`59`	`/** @deprecated */`
`60`	`60`	`public function setName($name)`
`61`	`61`	`{`
	`62`	`+ trigger_error(__METHOD__ . '() is deprecated, use constructor.', E_USER_DEPRECATED);`
`62`	`63`	`$this->__construct($name);`
`63`	`64`	`return $this;`
`64`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ class Class2 extends Class1`
`38`	`38`	`{`
`39`	`39`	`}`
`40`	`40`
`41`		`-$res[] = ClassType::from(new ReflectionClass('Trait1'));`
`42`		`-$res[] = ClassType::from(new ReflectionClass('Trait2'));`
`43`		`-$res[] = ClassType::from(new ReflectionClass('Class1'));`
`44`		`-$res[] = ClassType::from(new ReflectionClass('Class2'));`
	`41`	`+$res[] = ClassType::from('Trait1');`
	`42`	`+$res[] = ClassType::from('Trait2');`
	`43`	`+$res[] = ClassType::from('Class1');`
	`44`	`+$res[] = ClassType::from('Class2');`
`45`	`45`
`46`	`46`	`Assert::matchFile(__DIR__ . '/ClassType.from.trait.expect', implode("\n", $res));`