Add subject to InvalidException

Author: ivank

src/InvalidException.php

@@ -11,4 +11,26 @@
  */
 class InvalidException extends LogicException
 {
+    /**
+     * @var array|object
+     */
+    private $subject;
+
+    /**
+     * @param array|object $subject
+     */
+    public function setSubject($subject)
+    {
+        $this->subject = $subject;
+
+        return $this;
+    }
+
+    /**
+     * @return array|object
+     */
+    public function getSubject()
+    {
+        return $this->subject;
+    }
 }

src/ValidateTrait.php

@@ -54,7 +54,10 @@ public function validate()
     public function assertValid()
     {
         if (! $this->validate()) {
-            throw new InvalidException(sprintf('Has errors: %s', $this->getErrors()));
+            $exception = new InvalidException(sprintf('Has errors: %s', $this->getErrors()));
+            $exception->setSubject($this);
+
+            throw $exception;
         }
 
         return $this;

tests/src/InvalidExceptionTest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Harp\Validate\Test;
+
+use Harp\Validate\InvalidException;
+use Exception;
+
+/**
+ * @coversDefaultClass Harp\Validate\InvalidException
+ */
+class InvalidExceptionTest extends AbstractTestCase
+{
+    /**
+     * @covers ::setSubject
+     * @covers ::getSubject
+     */
+    public function testSubject()
+    {
+        $previous = new Exception();
+        $model = new Model();
+
+        $exception = new InvalidException('message', 123, $previous);
+        $exception->setSubject($model);
+
+        $this->assertSame($previous, $exception->getPrevious());
+        $this->assertSame(123, $exception->getCode());
+        $this->assertSame($model, $exception->getSubject());
+    }
+}

tests/src/ValidateTraitTest.php

@@ -3,9 +3,9 @@
 namespace Harp\Validate\Test;
 
 use Harp\Validate\Error;
+use Harp\Validate\InvalidException;
 
 /**
- * @group   asserts
  * @coversDefaultClass Harp\Validate\ValidateTrait
  */
 class ValidateTraitTest extends AbstractTestCase
@@ -54,8 +54,12 @@ public function testAssertValid()
 
         $model->test = null;
 
-        $this->setExpectedException('Harp\Validate\InvalidException', 'Has errors: test must be present');
-
-        $model->assertValid();
+        try {
+            $model->assertValid();
+            $this->fail('Should Throw an exception');
+        } catch (InvalidException $exception) {
+            $this->assertEquals('Has errors: test must be present', $exception->getMessage());
+            $this->assertSame($model, $exception->getSubject());
+        }
     }
 }