From 93e5f43f9c50dd1752ee51606508505fa84a0a7a Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Sat, 6 Apr 2024 21:02:45 +0200
Subject: [PATCH] annotations @inject is deprecated (BC break)

---
 src/DI/Helpers.php                            |  3 +++
 tests/DI/Container.inject.properties.phpt     |  7 +++---
 tests/DI/Helpers.parseAnnotation().phpt       | 22 ++++++++-----------
 tests/DI/InjectExtension.basic.phpt           |  7 +++---
 tests/DI/InjectExtension.errors.phpt          | 11 +++++-----
 ...InjectExtension.getInjectProperties().phpt |  6 ++---
 ...xtension.getInjectProperties().traits.phpt |  3 ++-
 7 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/DI/Helpers.php b/src/DI/Helpers.php
index 3597a3820..16d6b44ba 100644
--- a/src/DI/Helpers.php
+++ b/src/DI/Helpers.php
@@ -202,6 +202,7 @@ public static function prefixServiceName(mixed $config, string $namespace): mixe
 
 	/**
 	 * Returns an annotation value.
+	 * @deprecated
 	 */
 	public static function parseAnnotation(\Reflector $ref, string $name): ?string
 	{
@@ -211,6 +212,8 @@ public static function parseAnnotation(\Reflector $ref, string $name): ?string
 
 		$re = '#[\s*]@' . preg_quote($name, '#') . '(?=\s|$)(?:[ \t]+([^@\s]\S*))?#';
 		if ($ref->getDocComment() && preg_match($re, trim($ref->getDocComment(), '/*'), $m)) {
+			$alt = $name === 'inject' ? '#[Nette\DI\Attributes\Inject]' : 'alternative';
+			trigger_error("Annotation @$name is deprecated, use $alt (used in " . Reflection::toString($ref) . ')', E_USER_DEPRECATED);
 			return $m[1] ?? '';
 		}
 
diff --git a/tests/DI/Container.inject.properties.phpt b/tests/DI/Container.inject.properties.phpt
index 8b0203539..73324665c 100644
--- a/tests/DI/Container.inject.properties.phpt
+++ b/tests/DI/Container.inject.properties.phpt
@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Nette\DI;
+use Nette\DI\Attributes\Inject;
 use Tester\Assert;
 
 
@@ -23,16 +24,16 @@ class Foo implements IFoo
 
 class Test1
 {
-	/** @inject */
+	#[Inject]
 	public stdClass $varA;
 }
 
 class Test2 extends Test1
 {
-	/** @inject */
+	#[Inject]
 	public stdClass $varC;
 
-	/** @inject */
+	#[Inject]
 	public IFoo $varD;
 }
 
diff --git a/tests/DI/Helpers.parseAnnotation().phpt b/tests/DI/Helpers.parseAnnotation().phpt
index 3406024bd..44115be43 100644
--- a/tests/DI/Helpers.parseAnnotation().phpt
+++ b/tests/DI/Helpers.parseAnnotation().phpt
@@ -1,9 +1,5 @@
 <?php
 
-/**
- * Test: Nette\DI\Helpers::expand()
- */
-
 declare(strict_types=1);
 
 use Nette\DI\Helpers;
@@ -22,10 +18,10 @@ class TestClass
 
 $rc = new ReflectionClass(TestClass::class);
 
-Assert::same('', Helpers::parseAnnotation($rc, 'inject'));
-Assert::same(null, Helpers::parseAnnotation($rc, 'injec'));
-Assert::same('type', Helpers::parseAnnotation($rc, 'var'));
-Assert::same('bool|int', Helpers::parseAnnotation($rc, 'return'));
+Assert::same('', @Helpers::parseAnnotation($rc, 'inject'));
+Assert::same(null, @Helpers::parseAnnotation($rc, 'injec'));
+Assert::same('type', @Helpers::parseAnnotation($rc, 'var'));
+Assert::same('bool|int', @Helpers::parseAnnotation($rc, 'return'));
 
 
 /** @return*/
@@ -35,7 +31,7 @@ class TestClass2
 
 $rc = new ReflectionClass(TestClass2::class);
 
-Assert::same('', Helpers::parseAnnotation($rc, 'return'));
+Assert::same('', @Helpers::parseAnnotation($rc, 'return'));
 
 
 /** @return
@@ -47,7 +43,7 @@ class TestClass3
 
 $rc = new ReflectionClass(TestClass3::class);
 
-Assert::same('', Helpers::parseAnnotation($rc, 'return'));
+Assert::same('', @Helpers::parseAnnotation($rc, 'return'));
 
 
 /**
@@ -59,6 +55,6 @@ class TestClass4
 
 $rc = new ReflectionClass(TestClass4::class);
 
-Assert::same(null, Helpers::parseAnnotation($rc, 'inject'));
-Assert::same(null, Helpers::parseAnnotation($rc, 'injec'));
-Assert::same(null, Helpers::parseAnnotation($rc, 'var'));
+Assert::same(null, @Helpers::parseAnnotation($rc, 'inject'));
+Assert::same(null, @Helpers::parseAnnotation($rc, 'injec'));
+Assert::same(null, @Helpers::parseAnnotation($rc, 'var'));
diff --git a/tests/DI/InjectExtension.basic.phpt b/tests/DI/InjectExtension.basic.phpt
index 8cb99fc8b..2ae5b8eff 100644
--- a/tests/DI/InjectExtension.basic.phpt
+++ b/tests/DI/InjectExtension.basic.phpt
@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Nette\DI;
+use Nette\DI\Attributes\Inject;
 use Nette\DI\Definitions\Reference;
 use Nette\DI\Definitions\Statement;
 use Tester\Assert;
@@ -31,7 +32,7 @@ class ConcreteDependencyB extends AbstractDependency
 
 class ParentClass
 {
-	/** @inject */
+	#[Inject]
 	public stdClass $a;
 
 
@@ -47,10 +48,10 @@ class ParentClass
 
 class Service extends ParentClass
 {
-	/** @inject */
+	#[Inject]
 	public stdClass $c;
 
-	/** @inject */
+	#[Inject]
 	public AbstractDependency $e;
 
 
diff --git a/tests/DI/InjectExtension.errors.phpt b/tests/DI/InjectExtension.errors.phpt
index 0bd382707..8d9e6cdb4 100644
--- a/tests/DI/InjectExtension.errors.phpt
+++ b/tests/DI/InjectExtension.errors.phpt
@@ -7,6 +7,7 @@
 declare(strict_types=1);
 
 use Nette\DI;
+use Nette\DI\Attributes\Inject;
 use Nette\InvalidStateException;
 use Tester\Assert;
 
@@ -16,35 +17,35 @@ require __DIR__ . '/../bootstrap.php';
 
 class ServiceA
 {
-	/** @inject */
+	#[Inject]
 	public DateTimeImmutable $a;
 }
 
 
 class ServiceB
 {
-	/** @inject */
+	#[Inject]
 	public Unknown $a;
 }
 
 
 class ServiceC
 {
-	/** @inject */
+	#[Inject]
 	public $a;
 }
 
 
 class ServiceD
 {
-	/** @inject */
+	#[Inject]
 	protected $a;
 }
 
 
 class ServiceE
 {
-	/** @inject */
+	#[Inject]
 	public static $a;
 }
 
diff --git a/tests/DI/InjectExtension.getInjectProperties().phpt b/tests/DI/InjectExtension.getInjectProperties().phpt
index 65bf65a04..c7c997a1b 100644
--- a/tests/DI/InjectExtension.getInjectProperties().phpt
+++ b/tests/DI/InjectExtension.getInjectProperties().phpt
@@ -13,10 +13,10 @@ use Tester\Assert;
 
 class AClass
 {
-	/** @inject */
+	#[Inject]
 	public AInjected $varA;
 
-	/** @inject */
+	#[Inject]
 	public BInjected $varB;
 
 	public $varD;
@@ -27,7 +27,7 @@ class AClass
 
 class BadClass
 {
-	/** @inject */
+	#[Inject]
 	public AClass|stdClass $var;
 }
 
diff --git a/tests/DI/InjectExtension.getInjectProperties().traits.phpt b/tests/DI/InjectExtension.getInjectProperties().traits.phpt
index 42b625067..ba4022d49 100644
--- a/tests/DI/InjectExtension.getInjectProperties().traits.phpt
+++ b/tests/DI/InjectExtension.getInjectProperties().traits.phpt
@@ -16,10 +16,11 @@ namespace A
 namespace B
 {
 	use A\AInjected;
+	use Nette\DI\Attributes\Inject;
 
 	trait BTrait
 	{
-		/** @inject */
+		#[Inject]
 		public AInjected $varA;
 	}
 }