Merge pull request #22 from ezzatron/simplified-assertion-trimming

Simplified assertion exception stack trace trimming.
peridot-php · Sep 20, 2016 · 6bbd382 · 6bbd382
2 parents a03b1eb + 05e75a7
commit 6bbd382
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 22 deletions.
diff --git a/specs/responder/exception/assertion-exception.spec.php b/specs/responder/exception/assertion-exception.spec.php
@@ -4,7 +4,7 @@
 
 describe('AssertionException', function() {
     describe('::trim()', function() {
-        xit('handles traces without a Leo call', function() {
+        it('handles traces without a Leo call', function() {
             $exception = new Exception();
             AssertionException::trim($exception);
             expect(count($exception->getTrace()))->to->equal(0);

diff --git a/src/Responder/Exception/AssertionException.php b/src/Responder/Exception/AssertionException.php
@@ -60,32 +60,19 @@ public static function traceLeoCall(array $trace)
     {
         $prefix = 'Peridot\\Leo\\';
 
-        $index = null;
-        $broke = false;
+        for ($i = count($trace) - 1; $i >= 0; --$i) {
+            $entry = $trace[$i];
 
-        foreach ($trace as $index => $call) {
-            if (isset($call['class'])) {
-                if (0 !== strpos($call['class'], $prefix)) {
-                    $broke = true;
-
-                    break;
+            if (isset($entry['class'])) {
+                if (0 === strpos($entry['class'], $prefix)) {
+                    return $entry;
                 }
-            } elseif (0 !== strpos($call['function'], $prefix)) {
-                $broke = true;
-
-                break;
+            } elseif (0 === strpos($entry['function'], $prefix)) {
+                return $entry;
             }
         }
 
-        if (null === $index) {
-            return;
-        }
-
-        if (!$broke) {
-            ++$index;
-        }
-
-        return $trace[$index - 1];
+        return null;
     }
 
     /**