ray-di · koriym · May 15, 2026 · Dec 27, 2025 · Dec 31, 2025 · Jan 6, 2026
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,6 @@ build
 vendor/
 composer.phar
 composer.lock
+tests/tmp/*
+!tests/tmp/.placefolder
+.phpunit.result.cache
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
@@ -1,19 +1,12 @@
+build:
+    nodes:
+        analysis:
+            tests:
+                override:
+                    - php-scrutinizer-run
+            environment:
+                php:
+                    version: 8.2
+
 filter:
     paths: ["src/*"]
-tools:
-    external_code_coverage: true
-    php_code_coverage:
-        timeout: 1200
-    php_sim: true
-    php_mess_detector: true
-    php_pdepend: true
-    php_analyzer: true
-    php_cpd: true
-    php_mess_detector:
-        enabled: true
-        config:
-            ruleset: ./phpmd.xml
-    php_code_sniffer:
-        enabled: true
-        config:
-            ruleset: ./phpcs.xml
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.JA.md b/README.JA.md
@@ -79,7 +79,7 @@ public function createAction($id, $name, $body)
 
 ### Controller
 
-コントローラークラスにフォームをインジェクトします。フォームのバリデーションを行うメソッドを`@FormValidation`で
+コントローラークラスにフォームをインジェクトします。フォームのバリデーションを行うメソッドを`#[FormValidation]`で
 アノテートします。この時フォームのプロパティ名を`form`で、バリデーションが失敗したときのメソッドを`onFailure`で指定します。
 
 ```php
@@ -95,18 +95,13 @@ class MyController
      */
     protected $contactForm;
 
-    /**
-     * @Inject
-     * @Named("contact_form")
-     */
-    public function setForm(FormInterface $form)
+    #[Inject]
+    public function setForm(#[Named("contact_form")] FormInterface $form)
     {
         $this->contactForm = $form;
     }
 
-    /**
-     * @FormValidation(form="contactForm", onFailure="badRequestAction")
-     */
+    #[FormValidation(form: "contactForm", onFailure: "badRequestAction")]
     public function createAction()
     {
         // validation success
@@ -144,16 +139,14 @@ class MyForm extends AbstractAuraForm
 
 ## Validation Exception
 
-`@FormValidation`の代わりに`@InputValidation`とアノテートするとバリデーションが失敗したときに`Ray\WebFormModule\Exception\ValidationException`が投げられるよになります。この場合はHTML表現は使われません。Web APIアプリケーションなどに便利です。
+`#[FormValidation]`の代わりに`#[InputValidation]`とアノテートするとバリデーションが失敗したときに`Ray\WebFormModule\Exception\ValidationException`が投げられるよになります。この場合はHTML表現は使われません。Web APIアプリケーションなどに便利です。
 
 ```php
 use Ray\WebFormModule\Annotation\InputValidation;
 
 class Foo
 {
-    /**
-     * @InputValidation(form="form1")
-     */
+    #[InputValidation(form: "form1")]
     public function createAction($name)
     {
       // ...
@@ -190,17 +183,11 @@ echo $e->error;
 //}
 ```
 
-`@VndError`アノテーションで`vnd.error+json`に必要な情報を加えることができます。
+`#[VndError]`属性で`vnd.error+json`に必要な情報を加えることができます。
 
 ```php
-    /**
-     * @FormValidation(form="contactForm")
-     * @VndError(
-     *   message="foo validation failed",
-     *   logref="a1000", path="/path/to/error",
-     *   href={"_self"="/path/to/error", "help"="/path/to/help"}
-     * )
-     */
+    #[FormValidation(form: "contactForm")]
+    #[VndError(message: "foo validation failed", logref: "a1000", path: "/path/to/error", href: ["_self" => "/path/to/error", "help" => "/path/to/help"])]
 ```
 
 このオプションのモジュールはAPIアプリケーションの時に有用です。

diff --git a/README.md b/README.md
@@ -88,7 +88,7 @@ class MyForm extends AbstractForm
 ```
 ### Controller
 
-We annotate the methods which web form validation is required with `@FormValidation`. We can specify form object property name with `name` and failiure method name with `@onFailure`.
+We annotate the methods which web form validation is required with `#[FormValidation]`. We can specify form object property name with `form` and failure method name with `onFailure`.
 
 ```php
 use Ray\Di\Di\Inject;
@@ -103,21 +103,17 @@ class MyController
      */
     protected $contactForm;
 
-    /**
-     * @Inject
-     * @Named("contact_form")
-     */
-    public function setForm(FormInterface $form)
+    #[Inject]
+    public function setForm(#[Named("contact_form")] FormInterface $form)
     {
         $this->contactForm = $form;
     }
 
-    /**
-     * @FormValidation(form="contactForm", onFailure="badRequestAction")
-     */
+    #[FormValidation(form: "contactForm", onFailure: "badRequestAction")]
     public function createAction()
     {
         // validation success
+        // More detail for `vnd.error+json` can be added with `#[VndError]`.
     }
 
     public function badRequestAction()
@@ -183,17 +179,11 @@ echo $e->error;
 //}
 ```
 
-More detail for `vnd.error+json`can be add with `@VndError` annotation. 
+More detail for `vnd.error+json` can be added with the `#[VndError]` attribute.
 
 ```php
-    /**
-     * @FormValidation(form="contactForm")
-     * @VndError(
-     *   message="foo validation failed",
-     *   logref="a1000", path="/path/to/error",
-     *   href={"_self"="/path/to/error", "help"="/path/to/help"}
-     * )
-     */
+    #[FormValidation(form: "contactForm")]
+    #[VndError(message: "foo validation failed", logref: "a1000", path: "/path/to/error", href: ["_self" => "/path/to/error", "help" => "/path/to/help"])]
 ```
 
 This optional module is handy for API application. 

diff --git a/composer.json b/composer.json
@@ -6,15 +6,16 @@
         "Ray.Di module"
     ],
     "require": {
-        "php": ">=7.0.0",
-        "ray/di": "^2.7",
+        "php": ">=8.0.0",
+        "ray/di": "^2.16",
+        "ray/aop": "^2.14",
         "aura/input": "^1.2",
         "aura/filter": "^2.3|3.x-dev",
         "aura/html": "^2.5",
         "ray/aura-session-module": "^1.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7.13"
+        "phpunit/phpunit": "^9.5"
     },
     "license": "MIT",
     "autoload":{
@@ -32,5 +33,10 @@
         "coverage": ["php -dzend_extension=xdebug.so ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage"],
         "cs": ["php-cs-fixer fix -v --dry-run", "phpcs --standard=./phpcs.xml src"],
         "cs-fix": ["php-cs-fixer fix -v", "phpcbf src"]
+    },
+    "config": {
+        "allow-plugins": {
+            "aura/installer-default": true
+        }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,19 +1,21 @@
 <phpunit bootstrap="tests/bootstrap.php">
     <testsuites>
-        <testsuite>
+        <testsuite name="Ray.WebFormModule Test Suite">
             <directory suffix="Test.php">tests</directory>
         </testsuite>
     </testsuites>
 
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <report>
+            <html outputDirectory="build/coverage"/>
+            <clover outputFile="build/logs/clover.xml"/>
+        </report>
+    </coverage>
+
     <logging>
-        <log type="coverage-html" target="build/coverage"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+        <junit outputFile="build/logs/junit.xml"/>
     </logging>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
 </phpunit>