デバッグ用出力の除去、インターセプター束縛設定のmatcherを最適化

clap-and-whistle · Sep 18, 2022 · 150614d · 150614d
1 parent 8cc9871
commit 150614d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 15 deletions.
diff --git a/src/Interceptor/AuthCheckInterceptor.php b/src/Interceptor/AuthCheckInterceptor.php
@@ -11,7 +11,8 @@
 use Ray\Aop\MethodInterceptor;
 use Ray\Aop\MethodInvocation;
 use Ray\Di\Di\Named;
-use RuntimeException;
+
+use function assert;
 
 class AuthCheckInterceptor implements MethodInterceptor
 {
@@ -26,22 +27,18 @@ public function __construct(
      */
     public function invoke(MethodInvocation $invocation)
     {
-        $resourceObject = $invocation->getThis();
-        if (! $resourceObject instanceof AuthBaseResourceObject) {
-            // TODO: 後で消す（インターセプタ束縛を matcher->any() で設定してるところを直すときに）
-            throw new RuntimeException('AuthBaseResourceObject にだけ使用できるインターセプターです');
-        }
-
         // メソッド実行前の処理
         if ($this->cwSession->isNotAuthorized()) {
+            $resourceObject = $invocation->getThis();
+            assert($resourceObject instanceof AuthBaseResourceObject);
+
             return $this->makeError($resourceObject);
         }
 
         // メソッド実行
         $result = $invocation->proceed();
 
         // メソッド実行後の処理
-        // TODO: 後で消す
         if ($result instanceof AuthBaseResourceObject) {
             $result->setDebugMessage('認証済み確認後の処理を通過');
         }

diff --git a/src/Module/CwAuthModule.php b/src/Module/CwAuthModule.php
@@ -10,6 +10,7 @@
 use Cw\LearnBear\Infrastructure\Authentication\CwSession;
 use Cw\LearnBear\Infrastructure\Authentication\IdentityRepository;
 use Cw\LearnBear\Interceptor\AuthCheckInterceptor;
+use Cw\LearnBear\Resource\AuthBaseResourceObject;
 use Ray\Di\AbstractModule;
 
 class CwAuthModule extends AbstractModule
@@ -23,9 +24,9 @@ protected function configure()
         $this->bind(IdentityRepositoryInterface::class)->to(IdentityRepository::class);
 
         $this->bindInterceptor(
-            $this->matcher->any(),
-            $this->matcher->annotatedWith(CheckAuth::class),
-            [AuthCheckInterceptor::class],
+            $this->matcher->subclassesOf(AuthBaseResourceObject::class),    // AuthBaseResourceObjectの継承または実装クラスの
+            $this->matcher->annotatedWith(CheckAuth::class),    // @CheckAuthアノテーションがアノテートされているメソッドには
+            [AuthCheckInterceptor::class],  // AuthCheckInterceptorインターセプターを束縛
         );
     }
 }
diff --git a/var/templates/Page/Next.html.twig b/var/templates/Page/Next.html.twig
@@ -2,10 +2,6 @@
 {% block title %}Weekday{% endblock %}
 {% block content %}
 
-    {% if debug is defined %}
-        <pre>{{ debug }}</pre>
-    {% endif %}
-
     <h1>next</h1>
     <div>The weekday of {{ year }}/{{ month }}/{{ day }} is {{ weekday.weekday }}.</div>
     <div>