Bugs in ErrorCollection - fixes #11

Author: lindyhopchris

src/Error/ErrorCollection.php

@@ -149,13 +149,15 @@ public function getStatus()
             $status = $error->getStatus();
 
             if (400 <= $status && 499 >= $status) {
-                $request = is_null($request) ? $status : 400;
+                $request = is_null($request) ? $status : ($request == $status) ? $status : 400;
             } elseif (500 <= $status && 599 >= $status) {
-                $internal = is_null($internal) ? $status : 500;
+                $internal = is_null($internal) ? $status : ($internal == $status) ? $status : 500;
             }
         }
 
-        if (!is_null($internal)) {
+        if (!is_null($internal) && !is_null($request)) {
+            return '500';
+        } elseif (!is_null($internal)) {
             return (string) $internal;
         }
 

test/Error/ErrorCollectionTest.php

@@ -146,6 +146,7 @@ public function testMerge()
     public function testGetStatus5xx()
     {
         $this->a->setStatus(503);
+        $this->b->setStatus(503);
         $collection = new ErrorCollection([$this->a, $this->b]);
         $this->assertEquals(503, $collection->getStatus());
     }
@@ -161,6 +162,7 @@ public function testGetStatusMixed5xx()
     public function testGetStatus4xx()
     {
         $this->a->setStatus(422);
+        $this->b->setStatus(422);
         $collection = new ErrorCollection([$this->a, $this->b]);
         $this->assertEquals(422, $collection->getStatus());
     }
@@ -173,6 +175,14 @@ public function testGetStatusMixed4xx()
         $this->assertEquals(400, $collection->getStatus());
     }
 
+    public function testGetStatusMixed5xxAnd4xx()
+    {
+        $this->a->setStatus(405);
+        $this->b->setStatus(501);
+        $collection = new ErrorCollection([$this->a, $this->b]);
+        $this->assertEquals(500, $collection->getStatus());
+    }
+
     public function testGetStatusUnknown()
     {
         $collection = new ErrorCollection([$this->a, $this->b, $this->interface]);