Merge pull request #9 from ray-di/named-args

Implements NamedArgumentConstructorAnnotation
ray-di · Jan 18, 2021 · 2b8e1ae · 2b8e1ae
2 parents 1cbf443 + 4d38dc7
commit 2b8e1ae
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 23 deletions.
diff --git a/composer.json b/composer.json
@@ -5,7 +5,8 @@
         "annotation"
     ],
     "require": {
-        "php": "^5.4 || ^7.0 || ^8.0"
+        "php": "^5.4 || ^7.0 || ^8.0",
+        "doctrine/annotations": "^1.11"
     },
     "license": "MIT",
     "autoload":{

diff --git a/src/Annotation/AbstractWebContextParam.php b/src/Annotation/AbstractWebContextParam.php
@@ -2,10 +2,9 @@
 
 namespace Ray\WebContextParam\Annotation;
 
-use function is_array;
-use function is_string;
+use Doctrine\Common\Annotations\NamedArgumentConstructorAnnotation;
 
-abstract class AbstractWebContextParam
+abstract class AbstractWebContextParam implements NamedArgumentConstructorAnnotation
 {
     /**
      * Key of Super global value
@@ -22,23 +21,16 @@ abstract class AbstractWebContextParam
     /**
      * Parameter(Variable) name
      *
+     * This parameter is used to specify a parameter from a method in PHP7,
+     * and is not needed when attributing to a parameter in PHP8.
+     *
      * @var string
      */
     public $param;
 
-    /**
-     * @param string|array{key?: string, param?: string} $values
-     */
-    public function __construct($key)
+    public function __construct(string $key, string $param = '')
     {
-        if (is_array($key)) {
-            $this->key = $key['key'];
-            $this->param = $key['param'];
-
-            return;
-        }
-        if (is_string($key)) {
-            $this->key = $key;
-        }
+        $this->key = $key;
+        $this->param = $param;
     }
 }
diff --git a/src/Annotation/CookieParam.php b/src/Annotation/CookieParam.php
@@ -8,7 +8,7 @@
  * @Annotation
  * @Target("METHOD")
  */
-#[Attribute(Attribute::TARGET_PARAMETER)]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class CookieParam extends AbstractWebContextParam
 {
     const GLOBAL_KEY = '_COOKIE';

diff --git a/src/Annotation/EnvParam.php b/src/Annotation/EnvParam.php
@@ -8,7 +8,7 @@
  * @Annotation
  * @Target("METHOD")
  */
-#[Attribute(Attribute::TARGET_PARAMETER)]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class EnvParam extends AbstractWebContextParam
 {
     const GLOBAL_KEY = '_ENV';

diff --git a/src/Annotation/FilesParam.php b/src/Annotation/FilesParam.php
@@ -8,7 +8,7 @@
  * @Annotation
  * @Target("METHOD")
  */
-#[Attribute(Attribute::TARGET_PARAMETER)]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class FilesParam extends AbstractWebContextParam
 {
     const GLOBAL_KEY = '_FILES';

diff --git a/src/Annotation/FormParam.php b/src/Annotation/FormParam.php
@@ -8,7 +8,7 @@
  * @Annotation
  * @Target("METHOD")
  */
-#[Attribute(Attribute::TARGET_PARAMETER)]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class FormParam extends AbstractWebContextParam
 {
     const GLOBAL_KEY = '_POST';

diff --git a/src/Annotation/QueryParam.php b/src/Annotation/QueryParam.php
@@ -8,7 +8,7 @@
  * @Annotation
  * @Target("METHOD")
  */
-#[Attribute(Attribute::TARGET_PARAMETER)]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class QueryParam extends AbstractWebContextParam
 {
     const GLOBAL_KEY = '_GET';

diff --git a/src/Annotation/ServerParam.php b/src/Annotation/ServerParam.php
@@ -8,7 +8,7 @@
  * @Annotation
  * @Target("METHOD")
  */
-#[Attribute(Attribute::TARGET_PARAMETER)]
+#[Attribute(Attribute::TARGET_PARAMETER | Attribute::TARGET_METHOD | Attribute::IS_REPEATABLE)]
 final class ServerParam extends AbstractWebContextParam
 {
     const GLOBAL_KEY = '_SERVER';