@annotations are deprecated (BC break)

src/Application/UI/ComponentReflection.php

@@ -28,7 +28,7 @@ final class ComponentReflection extends \ReflectionClass
 
 
 	/**
-	 * Returns array of class properties that are public and have attribute #[Persistent] or #[Parameter] or annotation @persistent.
+	 * Returns array of class properties that are public and have attribute #[Persistent] or #[Parameter].
 	 * @return array<string, array{def: mixed, type: string, since: ?string}>
 	 */
 	public function getParameters(): array
@@ -75,7 +75,7 @@ public function getParameters(): array
 
 
 	/**
-	 * Returns array of persistent properties. They are public and have attribute #[Persistent] or annotation @persistent.
+	 * Returns array of persistent properties. They are public and have attribute #[Persistent].
 	 * @return array<string, array{def: mixed, type: string, since: string}>
 	 */
 	public function getPersistentParams(): array
@@ -189,6 +189,7 @@ public function getSignalMethod(string $signal): ?\ReflectionMethod
 
 	/**
 	 * Returns an annotation value.
+	 * @deprecated
 	 */
 	public static function parseAnnotation(\Reflector $ref, string $name): ?array
 	{
@@ -206,12 +207,20 @@ public static function parseAnnotation(\Reflector $ref, string $name): ?array
 			}
 		}
 
+		$alt = match ($name) {
+			'persistent' => '#[Nette\Application\Attributes\Persistent]',
+			'deprecated' => '#[Nette\Application\Attributes\Deprecated]',
+			'crossOrigin' => '#[Nette\Application\Attributes\Request(sameOrigin: false)]',
+			default => 'alternative'
+		};
+		trigger_error("Annotation @$name is deprecated, use $alt (used in " . Nette\Utils\Reflection::toString($ref) . ')', E_USER_DEPRECATED);
 		return $res;
 	}
 
 
 	/**
 	 * Has class specified annotation?
+	 * @deprecated
 	 */
 	public function hasAnnotation(string $name): bool
 	{
@@ -221,6 +230,7 @@ public function hasAnnotation(string $name): bool
 
 	/**
 	 * Returns an annotation value.
+	 * @deprecated
 	 */
 	public function getAnnotation(string $name): mixed
 	{

src/Application/UI/MethodReflection.php

@@ -17,18 +17,22 @@ final class MethodReflection extends \ReflectionMethod
 {
 	/**
 	 * Has method specified annotation?
+	 * @deprecated
 	 */
 	public function hasAnnotation(string $name): bool
 	{
+		trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
 		return (bool) ComponentReflection::parseAnnotation($this, $name);
 	}
 
 
 	/**
 	 * Returns an annotation value.
+	 * @deprecated
 	 */
 	public function getAnnotation(string $name): mixed
 	{
+		trigger_error(__METHOD__ . '() is deprecated', E_USER_DEPRECATED);
 		$res = ComponentReflection::parseAnnotation($this, $name);
 		return $res ? end($res) : null;
 	}

tests/UI/ComponentReflection.getParameters().phpt

@@ -16,7 +16,7 @@ class OnePresenter extends Presenter
 	public static $no1;
 	public $no2;
 
-	/** @persistent */
+	#[Persistent]
 	public $yes1;
 
 	#[Persistent, Parameter]

tests/UI/ComponentReflection.getPersistentComponents().phpt

@@ -14,14 +14,6 @@ class NonePresenter extends Presenter
 }
 
 
-/**
- * @persistent(a, b)
- */
-class AnnotationPresenter extends Presenter
-{
-}
-
-
 #[Persistent('a', 'b')]
 class AttributePresenter extends Presenter
 {
@@ -39,11 +31,6 @@ class MethodPresenter extends AttributePresenter
 
 Assert::same([], NonePresenter::getReflection()->getPersistentComponents());
 
-Assert::same([
-	'a' => ['since' => AnnotationPresenter::class],
-	'b' => ['since' => AnnotationPresenter::class],
-], AnnotationPresenter::getReflection()->getPersistentComponents());
-
 Assert::same([
 	'a' => ['since' => AttributePresenter::class],
 	'b' => ['since' => AttributePresenter::class],

tests/UI/ComponentReflection.parseAnnotation.phpt

@@ -34,11 +34,11 @@ class TestClass
 
 $rc = new ReflectionClass('TestClass');
 
-Assert::same(['value ="Johno\'s addendum"', 'mode=True', true, true], Reflection::parseAnnotation($rc, 'title'));
-Assert::null(Reflection::parseAnnotation($rc, 'public'));
-Assert::null(Reflection::parseAnnotation($rc, 'private'));
-Assert::same(['item 1'], Reflection::parseAnnotation($rc, 'components'));
-Assert::same([true, false, null], Reflection::parseAnnotation($rc, 'persistent'));
-Assert::same([true], Reflection::parseAnnotation($rc, 'renderable'));
-Assert::same(['loggedIn'], Reflection::parseAnnotation($rc, 'Secured\User'));
-Assert::null(Reflection::parseAnnotation($rc, 'missing'));
+Assert::same(['value ="Johno\'s addendum"', 'mode=True', true, true], @Reflection::parseAnnotation($rc, 'title'));
+Assert::null(@Reflection::parseAnnotation($rc, 'public'));
+Assert::null(@Reflection::parseAnnotation($rc, 'private'));
+Assert::same(['item 1'], @Reflection::parseAnnotation($rc, 'components'));
+Assert::same([true, false, null], @Reflection::parseAnnotation($rc, 'persistent'));
+Assert::same([true], @Reflection::parseAnnotation($rc, 'renderable'));
+Assert::same(['loggedIn'], @Reflection::parseAnnotation($rc, 'Secured\User'));
+Assert::null(@Reflection::parseAnnotation($rc, 'missing'));

tests/UI/Presenter.link().persistent.phpt

@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Nette\Application;
+use Nette\Application\Attributes\Persistent;
 use Nette\Http;
 use Tester\Assert;
 
@@ -16,13 +17,13 @@ require __DIR__ . '/../bootstrap.php';
 
 trait PersistentParam1
 {
-	/** @persistent */
+	#[Persistent]
 	public $t1;
 }
 
 trait PersistentParam2A
 {
-	/** @persistent */
+	#[Persistent]
 	public $t2;
 }
 
@@ -33,15 +34,15 @@ trait PersistentParam2B
 
 trait PersistentParam3
 {
-	/** @persistent */
+	#[Persistent]
 	public $t3;
 }
 
 class BasePresenter extends Application\UI\Presenter
 {
 	use PersistentParam1;
 
-	/** @persistent */
+	#[Persistent]
 	public $p1;
 }
 
@@ -50,7 +51,7 @@ class TestPresenter extends BasePresenter
 {
 	use PersistentParam2B;
 
-	/** @persistent */
+	#[Persistent]
 	public $p2;
 
 
@@ -81,10 +82,10 @@ class SecondPresenter extends BasePresenter
 {
 	use PersistentParam3;
 
-	/** @persistent */
+	#[Persistent]
 	public $p1 = 20;
 
-	/** @persistent */
+	#[Persistent]
 	public $p3;
 }
 
@@ -97,7 +98,7 @@ class ThirdPresenter extends BasePresenter
 
 class FourthPresenter extends BasePresenter
 {
-	#[Application\Attributes\Persistent]
+	#[Persistent]
 	public $p1;
 }
 

tests/UI/Presenter.link().phpt

@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Nette\Application;
+use Nette\Application\Attributes\Persistent;
 use Nette\Http;
 use Tester\Assert;
 
@@ -16,11 +17,11 @@ require __DIR__ . '/../bootstrap.php';
 
 class TestControl extends Application\UI\Control
 {
-	/** @persistent array */
-	public $order = [];
+	#[Persistent]
+	public array $order = [];
 
-	/** @persistent int */
-	public $round = 0;
+	#[Persistent]
+	public int $round = 0;
 
 
 	public function handleClick($x, $y)
@@ -50,22 +51,22 @@ class TestControl extends Application\UI\Control
 
 class TestPresenter extends Application\UI\Presenter
 {
-	/** @persistent */
+	#[Persistent]
 	public $p;
 
-	/** @persistent */
+	#[Persistent]
 	public $pint = 10;
 
-	/** @persistent */
+	#[Persistent]
 	public $parr = [];
 
-	/** @persistent */
+	#[Persistent]
 	public $pbool = true;
 
-	/** @persistent */
+	#[Persistent]
 	public array $parrn;
 
-	/** @persistent */
+	#[Persistent]
 	public ?bool $pbooln = null;
 
 
@@ -294,7 +295,7 @@ class TestPresenter extends Application\UI\Presenter
 
 class OtherPresenter extends TestPresenter
 {
-	/** @persistent */
+	#[Persistent]
 	public $p = 20;
 }
 

tests/UI/fixtures/ParamPresenter.php

@@ -4,7 +4,7 @@
 
 class ParamPresenter extends Nette\Application\UI\Presenter
 {
-	/** @persistent */
+	#[Nette\Application\Attributes\Persistent]
 	public $bool = true;