code refactor

laravel · Jun 29, 2016 · a0cd0ae · a0cd0ae
1 parent 9f50776
commit a0cd0ae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 21 deletions.
diff --git a/src/Illuminate/Support/MessageBag.php b/src/Illuminate/Support/MessageBag.php
@@ -96,26 +96,15 @@ protected function isUnique($key, $message)
     }
 
     /**
-     * Determine if messages exist for a given key.
+     * Determine if messages exist for a given key(s).
      *
-     * @param  string  $key
+     * @param  array|string  $key
      * @return bool
      */
     public function has($key = null)
     {
-        return $this->first($key) !== '';
-    }
-
-    /**
-     * Determine if messages exist for all given keys.
-     *
-     * @param  array  $keys
-     * @return bool
-     */
-    public function hasAll($keys = [])
-    {
-        foreach ($keys as $key) {
-            if ($this->first($key) === '') {
+        foreach ((array) $key as $k) {
+            if ($this->first($k) === '') {
                 return false;
             }
         }
@@ -124,15 +113,15 @@ public function hasAll($keys = [])
     }
 
     /**
-     * Determine if messages exist for any given key.
+     * Determine if messages exist for any of the given keys.
      *
      * @param  array  $keys
      * @return bool
      */
     public function hasAny($keys = [])
     {
         foreach ($keys as $key) {
-            if ($this->first($key) !== '') {
+            if ($this->has($key)) {
                 return true;
             }
         }

diff --git a/tests/Support/SupportMessageBagTest.php b/tests/Support/SupportMessageBagTest.php
@@ -86,16 +86,16 @@ public function testHasAnyIndicatesExistence()
         $this->assertFalse($container->hasAny(['baz']));
     }
 
-    public function testHasAllIndicatesExistence()
+    public function testHasIndicatesExistenceOfAllKeys()
     {
         $container = new MessageBag;
         $container->setFormat(':message');
         $container->add('foo', 'bar');
         $container->add('bar', 'foo');
         $container->add('boom', 'baz');
-        $this->assertTrue($container->hasAll(['foo', 'bar', 'boom']));
-        $this->assertFalse($container->hasAll(['foo', 'bar', 'boom', 'baz']));
-        $this->assertFalse($container->hasAll(['foo', 'baz']));
+        $this->assertTrue($container->has(['foo', 'bar', 'boom']));
+        $this->assertFalse($container->has(['foo', 'bar', 'boom', 'baz']));
+        $this->assertFalse($container->has(['foo', 'baz']));
     }
 
     public function testAllReturnsAllMessages()