Browse Source

Renamed getErrorMessage to getRequiredMessage

Jeremy Harris 8 years ago
parent
commit
ee70bb89e9

+ 1 - 1
src/View/Form/ArrayContext.php

@@ -209,7 +209,7 @@ class ArrayContext implements ContextInterface
     /**
      * {@inheritDoc}
      */
-    public function getErrorMessage($field)
+    public function getRequiredMessage($field)
     {
         return null;
     }

+ 1 - 1
src/View/Form/ContextInterface.php

@@ -76,7 +76,7 @@ interface ContextInterface
      * @param string $field A dot separated path to the field
      * @return string
      */
-    public function getErrorMessage($field);
+    public function getRequiredMessage($field);
 
     /**
      * Get the fieldnames of the top level object in this context.

+ 1 - 1
src/View/Form/EntityContext.php

@@ -429,7 +429,7 @@ class EntityContext implements ContextInterface
     /**
      * {@inheritDoc}
      */
-    public function getErrorMessage($field)
+    public function getRequiredMessage($field)
     {
         $parts = explode('.', $field);
 

+ 1 - 1
src/View/Form/FormContext.php

@@ -137,7 +137,7 @@ class FormContext implements ContextInterface
     /**
      * {@inheritDoc}
      */
-    public function getErrorMessage($field)
+    public function getRequiredMessage($field)
     {
         return null;
     }

+ 1 - 1
src/View/Form/NullContext.php

@@ -86,7 +86,7 @@ class NullContext implements ContextInterface
     /**
      * {@inheritDoc}
      */
-    public function getErrorMessage($field)
+    public function getRequiredMessage($field)
     {
         return null;
     }

+ 1 - 1
src/View/Helper/FormHelper.php

@@ -1433,7 +1433,7 @@ class FormHelper extends Helper
             $options['required'] = $context->isRequired($fieldName);
         }
 
-        $message = $context->getErrorMessage($fieldName);
+        $message = $context->getRequiredMessage($fieldName);
         if ($options['required'] && $message) {
             $message = htmlspecialchars(addslashes($message));
             $options['oninvalid'] = "this.setCustomValidity('$message')";

+ 4 - 4
tests/TestCase/View/Form/EntityContextTest.php

@@ -67,11 +67,11 @@ class EntityContextTest extends TestCase
     }
 
     /**
-     * tests getMessage
+     * tests getRequiredMessage
      *
      * @return void
      */
-    public function testGetMessage()
+    public function testGetRequiredMessage()
     {
         $this->_setupTables();
 
@@ -81,8 +81,8 @@ class EntityContextTest extends TestCase
             'validator' => 'create',
         ]);
 
-        $this->assertNull($context->getErrorMessage('body'));
-        $this->assertSame('Don\'t forget a title!', $context->getErrorMessage('title'));
+        $this->assertNull($context->getRequiredMessage('body'));
+        $this->assertSame('Don\'t forget a title!', $context->getRequiredMessage('title'));
     }
 
     /**