Making AggregateException a child of RejectionException

src/AggregateException.php

@@ -4,18 +4,13 @@
 /**
  * Exception thrown when too many errors occur in the some() or any() methods.
  */
-class AggregateException extends \Exception
+class AggregateException extends RejectionException
 {
-    private $reasons;
-
     public function __construct($msg, array $reasons)
     {
-        parent::__construct($msg);
-        $this->reasons = $reasons;
-    }
-
-    public function getReasons()
-    {
-        return $this->reasons;
+        parent::__construct(
+            $reasons,
+            sprintf('%s; %d rejected promises', $msg, count($reasons))
+        );
     }
 }

src/RejectionException.php

@@ -12,18 +12,22 @@ class RejectionException extends \RuntimeException
     private $reason;
 
     /**
-     * @param mixed $reason Rejection reason.
+     * @param mixed $reason       Rejection reason.
+     * @param string $description Optional description
      */
-    public function __construct($reason)
+    public function __construct($reason, $description = null)
     {
         $this->reason = $reason;
 
         $message = 'The promise was rejected';
-        if (is_string($reason)
+
+        if ($description) {
+            $message .= ' with reason: ' . $description;
+        } elseif (is_string($reason)
             || (is_object($reason) && method_exists($reason, '__toString'))
         ) {
             $message .= ' with reason: ' . $this->reason;
-        } elseif (is_array($reason) || $reason instanceof \JsonSerializable) {
+        } elseif ($reason instanceof \JsonSerializable) {
             $message .= ' with reason: '
                 . json_encode($this->reason, JSON_PRETTY_PRINT);
         }

tests/AggregateExceptionTest.php

@@ -5,10 +5,10 @@
 
 class AggregateExceptionTest extends \PHPUnit_Framework_TestCase
 {
-    public function testHasReasons()
+    public function testHasReason()
     {
         $e = new AggregateException('foo', ['baz', 'bar']);
         $this->assertContains('foo', $e->getMessage());
-        $this->assertEquals(['baz', 'bar'], $e->getReasons());
+        $this->assertEquals(['baz', 'bar'], $e->getReason());
     }
 }

tests/RejectionExceptionTest.php

@@ -3,7 +3,7 @@
 
 use GuzzleHttp\Promise\RejectionException;
 
-class Thing
+class Thing1
 {
     public function __construct($message)
     {
@@ -16,24 +16,32 @@ public function __toString()
     }
 }
 
+class Thing2 implements \JsonSerializable
+{
+    public function jsonSerialize()
+    {
+        return '{}';
+    }
+}
+
 /**
  * @covers GuzzleHttp\Promise\RejectionException
  */
 class RejectionExceptionTest extends \PHPUnit_Framework_TestCase
 {
     public function testCanGetReasonFromException()
     {
-        $thing = new Thing('foo');
+        $thing = new Thing1('foo');
         $e = new RejectionException($thing);
 
         $this->assertSame($thing, $e->getReason());
         $this->assertEquals('The promise was rejected with reason: foo', $e->getMessage());
     }
 
-    public function testCanGetReasonMessageFromArrayOrJson()
+    public function testCanGetReasonMessageFromJson()
     {
-        $reason = ['foo' => 'bar'];
+        $reason = new Thing2();
         $e = new RejectionException($reason);
-        $this->assertContains("{\n    \"foo\": \"bar\"\n}", $e->getMessage());
+        $this->assertContains("{}", $e->getMessage());
     }
 }

tests/functionsTest.php

@@ -148,7 +148,7 @@ public function testSomeRejectsWhenTooManyRejections()
         });
         P\queue()->run();
         $this->assertInstanceOf('GuzzleHttp\Promise\AggregateException', $called);
-        $this->assertContains('bad', $called->getReasons());
+        $this->assertContains('bad', $called->getReason());
     }
 
     public function testCanWaitUntilSomeCountIsSatisfied()