Fix error if custom validator doesn't provides a message

larsbonczek · Mar 27, 2019 · ac13596 · ac13596
1 parent d133fba
commit ac13596
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## Develop
+- Fix error if custom validator doesn't provides a message
+
 ## [4.2.1] - 2019-01-13
 - Fix issue with ResourceLocator
 

diff --git a/src/ServerSideValidator.php b/src/ServerSideValidator.php
@@ -177,10 +177,14 @@ private function ruleWithMessage($rule, $messageSet)
         // Weird way to adapt with Valitron's funky interface
         $params = array_merge([$rule], array_slice(func_get_args(), 2));
         call_user_func_array([$this, 'rule'], $params);
+
         // Set message.  Use Valitron's default message if not specified in the schema.
         if (!$messageSet) {
-            $messageSet = "'".$params[1]."' ".vsprintf(static::$_ruleMessages[$rule], array_slice(func_get_args(), 3));
+            $message = (isset(static::$_ruleMessages[$rule])) ? static::$_ruleMessages[$rule] : null;
+            $message = vsprintf($message, array_slice(func_get_args(), 3));
+            $messageSet = "'{$params[1]}' $message";
         }
+
         $this->message($messageSet);
     }
 

diff --git a/tests/ServerSideValidatorTest.php b/tests/ServerSideValidatorTest.php
@@ -78,7 +78,7 @@ public function testValidateArray()
     {
         // Arrange
         $schema = new RequestSchemaRepository([
-            'array' => [
+            'screech' => [
                 'validators' => [
                     'array' => [
                         'message' => 'Array must be an array.',
@@ -91,18 +91,18 @@ public function testValidateArray()
         $validator = new ServerSideValidator($schema, $this->translator);
 
         $result = $validator->validate([
-            'array' => ['foo', 'bar'],
+            'screech' => ['foo', 'bar'],
         ]);
 
         // Check that the correct Valitron rule was generated
-        $this->assertTrue($validator->hasRule('array', 'array'));
+        $this->assertTrue($validator->hasRule('array', 'screech'));
 
         // Check passing validation
         $this->assertTrue($result);
 
         // Check failing validation
         $this->assertFalse($validator->validate([
-            'array' => 'screeeech',
+            'screech' => 'screeeech',
         ]));
     }
 
@@ -864,4 +864,32 @@ public function testDomainRulesServerOnly()
         // Check passing validation
         $this->assertFalse($result);
     }
+
+    /**
+     * @depends testValidateUsername
+     */
+    public function testValidateWithNoValidatorMessage()
+    {
+        // Arrange
+        $schema = new RequestSchemaRepository([
+            'user_name' => [
+                'validators' => [
+                    'username' => [],
+                ],
+            ],
+        ]);
+
+        // Act
+        $validator = new ServerSideValidator($schema, $this->translator);
+
+        $result = $validator->validate([
+            'user_name' => 'alex.weissman',
+        ]);
+
+        // Check that the correct Valitron rule was generated
+        $this->assertTrue($validator->hasRule('username', 'user_name'));
+
+        // Check passing validation
+        $this->assertTrue($result);
+    }
 }