[7.x] Performance improvements

src/Illuminate/Support/MessageBag.php

@@ -298,6 +298,21 @@ public function getMessageBag()
         return $this;
     }
 
+    /**
+     * Generate an array of all attributes that have messages.
+     *
+     * @return array
+     */
+    public function attributes()
+    {
+        $attributes = [];
+        foreach ($this->messages as $key => $message) {
+            $attributes[explode('.', $key)[0]] = $key;
+        }
+
+        return $attributes;
+    }
+
     /**
      * Get the default message format.
      *

src/Illuminate/Validation/ValidationRuleParser.php

@@ -133,7 +133,9 @@ protected function explodeWildcardRules($results, $attribute, $rules)
                 foreach ((array) $rules as $rule) {
                     $this->implicitAttributes[$attribute][] = strval($key);
 
-                    $results = $this->mergeRules($results, $key, $rule);
+                    foreach ($this->getRules($key, $rule) as $rKey => $rVal) {
+                        $results[$rKey] = $rVal;
+                    }
                 }
             }
         }
@@ -164,6 +166,27 @@ public function mergeRules($results, $attribute, $rules = [])
         );
     }
 
+    /**
+     * Get rules of a given attribute(s).
+     *
+     * @param  string|array  $attribute
+     * @param  string|array  $rules
+     * @return array
+     */
+    public function getRules($attribute, $rules = [])
+    {
+        if (is_array($attribute)) {
+            $all = [];
+            foreach ((array) $attribute as $innerAttribute => $innerRules) {
+                $all[$innerRules] = head($this->explodeRules([$innerRules]));
+            }
+
+            return $all;
+        }
+
+        return [$attribute => head($this->explodeRules([$rules]))];
+    }
+
     /**
      * Merge additional rules into a given attribute.
      *

src/Illuminate/Validation/Validator.php

@@ -20,6 +20,13 @@ class Validator implements ValidatorContract
     use Concerns\FormatsMessages,
         Concerns\ValidatesAttributes;
 
+    /**
+     * Maximum number of translated error messages.
+     *
+     * @var int
+     */
+    public static $maxMessages = 2000;
+
     /**
      * The Translator implementation.
      *
@@ -97,6 +104,13 @@ class Validator implements ValidatorContract
      */
     protected $implicitAttributes = [];
 
+    /**
+     * The dictionary of wildcard attributes with their asterisks expanded.
+     *
+     * @var array
+     */
+    protected $implicitDictionary = [];
+
     /**
      * The callback that should be used to format the attribute.
      *
@@ -520,8 +534,8 @@ protected function getExplicitKeys($attribute)
      */
     protected function getPrimaryAttribute($attribute)
     {
-        foreach ($this->implicitAttributes as $unparsed => $parsed) {
-            if (in_array($attribute, $parsed)) {
+        foreach ($this->implicitDictionary as $unparsed => $parsed) {
+            if (array_key_exists($attribute, $parsed)) {
                 return $unparsed;
             }
         }
@@ -709,9 +723,13 @@ public function addFailure($attribute, $rule, $parameters = [])
             return $this->excludeAttribute($attribute);
         }
 
-        $this->messages->add($attribute, $this->makeReplacements(
-            $this->getMessage($attribute, $rule), $attribute, $rule, $parameters
-        ));
+        if (count($this->failedRules) < static::$maxMessages) {
+            $this->messages->add($attribute, $this->makeReplacements(
+                $this->getMessage($attribute, $rule), $attribute, $rule, $parameters
+            ));
+        } else {
+            $this->messages->add($attribute, 'Invalid');
+        }
 
         $this->failedRules[$attribute][$rule] = $parameters;
     }
@@ -778,9 +796,7 @@ public function invalid()
      */
     protected function attributesThatHaveMessages()
     {
-        return collect($this->messages()->toArray())->map(function ($message, $key) {
-            return explode('.', $key)[0];
-        })->unique()->flip()->all();
+        return $this->messages()->attributes();
     }
 
     /**
@@ -957,6 +973,11 @@ public function addRules($rules)
         $this->implicitAttributes = array_merge(
             $this->implicitAttributes, $response->implicitAttributes
         );
+        $this->implicitDictionary = array_merge(
+            $this->implicitDictionary, array_map(function ($value) {
+                return array_flip(array_values($value));
+            }, $response->implicitAttributes)
+        );
     }
 
     /**