passing validation ClassMetadata to the validator handler method

cubiche · Mar 21, 2017 · 6730caf · 6730caf
1 parent 8067219
commit 6730caf
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/Middlewares/Validator/ValidatorMiddleware.php b/Middlewares/Validator/ValidatorMiddleware.php
@@ -28,12 +28,18 @@ class ValidatorMiddleware extends MessageHandlerMiddleware
     public function handle($message, callable $next)
     {
         $this->ensureTypeOfMessage($message);
-        Validator::assert($message);
 
         try {
             $handler = $this->handlerClassResolver->resolve($message);
+            $metadata = Validator::getMetadataForClass(get_class($message));
+            $classMetadata = null;
+
+            if ($metadata !== null) {
+                /** @var ClassMetadata $classMetadata */
+                $classMetadata = $metadata->getRootClassMetadata();
+            }
 
-            $handler($message);
+            $handler($message, $classMetadata);
         } catch (NotFoundException $e) {
             // NotFoundException::handlerMethodNameForObject
             // NotFoundException::methodForObject
@@ -42,6 +48,7 @@ public function handle($message, callable $next)
             }
         }
 
+        Validator::assert($message);
         $next($message);
     }
 }