refactor: rearrange assertAll params, make assert optional in key

adhocore · Feb 28, 2019 · 99a31a2 · 99a31a2
1 parent 3260cdf
commit 99a31a2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Asserts.php b/src/Asserts.php
@@ -52,10 +52,16 @@ public function assertArrayHasKeys(array $expectedKeys, array $actualArray, stri
         }
     }
 
-    public function assertAll($actual, array $assertions, array $messages = [])
+    public function assertAll(array $expectations, $actual, array $messages = [])
     {
-        foreach ($assertions as $assert => $expected) {
-            $this->{$assert}($expected, $actual, $messages[$assert] ?? null);
+        foreach ($expectations as $assert => $expected) {
+            if (strpos($assert, 'assert') === false) {
+                $assert = 'assert' . ucfirst($assert);
+            }
+
+            $msgKey = \str_replace('assert', '', $assert);
+
+            $this->{$assert}($expected, $actual, $messages[$assert] ?? $messages[$msgKey] ?? null);
         }
     }
 }