PassInvalidException now returns an exception message

eymengunay · Oct 6, 2016 · 1787b69 · 1787b69
1 parent 121d2a6
commit 1787b69
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/src/Passbook/Exception/PassInvalidException.php b/src/Passbook/Exception/PassInvalidException.php
@@ -7,13 +7,20 @@
  */
 class PassInvalidException extends \RuntimeException
 {
+    /**
+     * @var array
+     */
+    protected $errors;
+
     /**
      * Construct a PassInvalidException either with or without an array of errors.
      *
+     * @param string        $string
      * @param string[]|null $errors
      */
-    public function __construct(array $errors = null)
+    public function __construct($message = '', array $errors = null)
     {
+        parent::__construct($message);
         $this->errors = $errors ? $errors : array();
     }
 

diff --git a/src/Passbook/PassFactory.php b/src/Passbook/PassFactory.php
@@ -251,7 +251,7 @@ public function package(PassInterface $pass, $passName = '')
 
         if ($this->passValidator) {
             if (!$this->passValidator->validate($pass)){
-                throw new PassInvalidException($this->passValidator->getErrors());
+                throw new PassInvalidException('Failed to validate passbook', $this->passValidator->getErrors());
             };
         }
 

diff --git a/tests/Passbook/Tests/Exception/PassInvalidExceptionTest.php b/tests/Passbook/Tests/Exception/PassInvalidExceptionTest.php
@@ -17,10 +17,20 @@ public function testNewExceptionWithoutErrorsArray()
     public function testNewExceptionWithErrorsArray()
     {
         $errors = array('error 1', 'error 2');
-        $exception = new PassInvalidException($errors);
+        $exception = new PassInvalidException('', $errors);
 
         self::assertTrue(is_array($exception->getErrors()));
         self::assertEquals($errors, $exception->getErrors());
     }
 
+    public function testNewExceptionWithMessageAndArray()
+    {
+        $errors = array('error 1', 'error 2');
+        $exception = new PassInvalidException('Exception message', $errors);
+
+        self::assertTrue(is_array($exception->getErrors()));
+        self::assertEquals($errors, $exception->getErrors());
+        self::assertSame('Exception message', $exception->getMessage());
+    }
+
 }