Updates according to feedback

Nyholm · Nyholm · commit d7f72c059b39 · 2018-03-27T09:40:31.000+02:00
diff --git a/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php b/src/Symfony/Component/Messenger/Exception/ValidationFailedException.php
@@ -21,6 +21,10 @@ class ValidationFailedException extends \RuntimeException implements ExceptionIn
     protected $violations;
     protected $violatingMessage;
 
+    /**
+     * @param object $violatingMessage
+     * @param ConstraintViolationListInterface $violations
+     */
     public function __construct($violatingMessage, ConstraintViolationListInterface $violations)
     {
         $this->violatingMessage = $violatingMessage;
@@ -29,17 +33,12 @@ public function __construct($violatingMessage, ConstraintViolationListInterface
         parent::__construct($this->__toString());
     }
 
-    public function __toString()
-    {
-        return sprintf("Message of type %s failed validation\n\n%s", get_class($this->violatingMessage), (string) $this->violations);
-    }
-
     public function getViolatingMessage()
     {
         return $this->violatingMessage;
     }
 
-    public function getViolations()
+    public function getViolations(): ConstraintViolationListInterface
     {
         return $this->violations;
     }
diff --git a/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php b/src/Symfony/Component/Messenger/Middleware/ValidationMiddleware.php
@@ -20,9 +20,6 @@
  */
 class ValidationMiddleware implements MiddlewareInterface
 {
-    /**
-     * @var ValidatorInterface
-     */
     private $validator;
 
     public function __construct(ValidatorInterface $validator)

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,10 @@ class ValidationFailedException extends \RuntimeException implements ExceptionIn`
`21`	`21`	`protected $violations;`
`22`	`22`	`protected $violatingMessage;`
`23`	`23`
	`24`	`+ /**`
	`25`	`+ * @param object $violatingMessage`
	`26`	`+ * @param ConstraintViolationListInterface $violations`
	`27`	`+ */`
`24`	`28`	`public function __construct($violatingMessage, ConstraintViolationListInterface $violations)`
`25`	`29`	`{`
`26`	`30`	`$this->violatingMessage = $violatingMessage;`
`@@ -29,17 +33,12 @@ public function __construct($violatingMessage, ConstraintViolationListInterface`
`29`	`33`	`parent::__construct($this->__toString());`
`30`	`34`	`}`
`31`	`35`
`32`		`- public function __toString()`
`33`		`- {`
`34`		`- return sprintf("Message of type %s failed validation\n\n%s", get_class($this->violatingMessage), (string) $this->violations);`
`35`		`- }`
`36`		`-`
`37`	`36`	`public function getViolatingMessage()`
`38`	`37`	`{`
`39`	`38`	`return $this->violatingMessage;`
`40`	`39`	`}`
`41`	`40`
`42`		`- public function getViolations()`
	`41`	`+ public function getViolations(): ConstraintViolationListInterface`
`43`	`42`	`{`
`44`	`43`	`return $this->violations;`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,6 @@`
`20`	`20`	`*/`
`21`	`21`	`class ValidationMiddleware implements MiddlewareInterface`
`22`	`22`	`{`
`23`		`- /**`
`24`		`- * @var ValidatorInterface`
`25`		`- */`
`26`	`23`	`private $validator;`
`27`	`24`
`28`	`25`	`public function __construct(ValidatorInterface $validator)`