Merge pull request #240 from koriym/NamedArgumentConstructor

Replace deprecated marker interface
ray-di · Mar 12, 2021 · c7cb189 · c7cb189
2 parents d8f131d + f59764f
commit c7cb189
Show file tree

Hide file tree

Showing 5 changed files with 108 additions and 106 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": "^7.2 || ^8.0",
-        "doctrine/annotations": "^1.11",
+        "doctrine/annotations": "^1.12",
         "doctrine/cache": "^1.10",
         "koriym/attributes": "^1.0",
         "koriym/null-object": "^0.1",

diff --git a/src/di/Di/Assisted.php b/src/di/Di/Assisted.php
@@ -5,6 +5,7 @@
 namespace Ray\Di\Di;
 
 use Attribute;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Doctrine\Common\Annotations\NamedArgumentConstructorAnnotation;
 use Ray\Aop\Annotation\AbstractAssisted;
 
@@ -13,9 +14,10 @@
  *
  * @Annotation
  * @Target("METHOD")
+ * @NamedArgumentConstructor
  */
 #[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_PARAMETER)]
-final class Assisted extends AbstractAssisted implements NamedArgumentConstructorAnnotation
+final class Assisted extends AbstractAssisted
 {
     /** @var array<string> */
     public $values;

diff --git a/src/di/Di/Inject.php b/src/di/Di/Inject.php
@@ -5,16 +5,18 @@
 namespace Ray\Di\Di;
 
 use Attribute;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Doctrine\Common\Annotations\NamedArgumentConstructorAnnotation;
 
 /**
  * Annotates your class methods into which the Injector should inject values
  *
  * @Annotation
  * @Target("METHOD")
+ * @NamedArgumentConstructor
  */
 #[Attribute(Attribute::TARGET_METHOD | Attribute::TARGET_PARAMETER)]
-final class Inject implements InjectInterface, NamedArgumentConstructorAnnotation
+final class Inject implements InjectInterface
 {
     /**
      * If true, and the appropriate binding is not found, the Injector will skip injection of this method or field rather than produce an error.

diff --git a/src/di/Di/Named.php b/src/di/Di/Named.php
@@ -5,16 +5,18 @@
 namespace Ray\Di\Di;
 
 use Attribute;
+use Doctrine\Common\Annotations\Annotation\NamedArgumentConstructor;
 use Doctrine\Common\Annotations\NamedArgumentConstructorAnnotation;
 
 /**
  * Annotates named things
  *
  * @Annotation
  * @Target("METHOD")
+ * @NamedArgumentConstructor
  */
 #[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD)]
-final class Named implements NamedArgumentConstructorAnnotation
+final class Named
 {
     /** @var string */
     public $value = '';