annotations @Inject is deprecated (BC break)

nette · Nov 29, 2024 · b308c9b · b308c9b
1 parent 8e6eb57
commit b308c9b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/src/DI/Extensions/InjectExtension.php b/src/DI/Extensions/InjectExtension.php
@@ -121,6 +121,9 @@ public static function getInjectProperties(string $class): array
 				$rp->getAttributes(DI\Attributes\Inject::class)
 				|| DI\Helpers::parseAnnotation($rp, 'inject') !== null
 			) {
+				if (!$rp->getAttributes(DI\Attributes\Inject::class)) {
+					trigger_error('Annotation @inject is deprecated, use #[Nette\\DI\\Attributes\\Inject] (used in ' . Reflection::toString($rp) . ')', E_USER_DEPRECATED);
+				}
 				if (!$rp->isPublic() || $rp->isStatic() || $rp->isReadOnly()) {
 					throw new Nette\InvalidStateException(sprintf('Property %s for injection must not be static, readonly and must be public.', Reflection::toString($rp)));
 				}

diff --git 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/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
@@ -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
@@ -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
@@ -16,10 +16,11 @@ namespace A
 namespace B
 {
 	use A\AInjected;
+	use Nette\DI\Attributes\Inject;
 
 	trait BTrait
 	{
-		/** @inject */
+		#[Inject]
 		public AInjected $varA;
 	}
 }