Fixed #3934

craftcms · Mar 4, 2019 · a9aebe4 · a9aebe4
1 parent ca1f664
commit a9aebe4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -20,6 +20,7 @@
 - Fixed a bug where Craft wasn’t always preselecting the correct tab on Control Panel pages if the tab name contained non-ASCII characters. ([#3923](https://github.com/craftcms/cms/issues/3923))
 - Fixed a bug where the `--uid` option on `resave/*` console commands wasn’t working.
 - Fixed a SQL error that could occur when running `resave/*` console commands.
+- Fixed a PHP error that occurred when calling the deprecated `getError()` method on a model that had no errors. ([#3934](https://github.com/craftcms/cms/issues/3934))
 
 ## 3.1.15 - 2019-02-26
 

diff --git a/src/base/Model.php b/src/base/Model.php
@@ -189,10 +189,10 @@ public function hasErrors($attribute = null)
      * Returns the first error of the specified attribute.
      *
      * @param string $attribute The attribute name.
-     * @return string The error message. Null is returned if no error.
+     * @return string|null The error message, or null if there are no errors.
      * @deprecated in 3.0. Use [[getFirstError()]] instead.
      */
-    public function getError(string $attribute): string
+    public function getError(string $attribute)
     {
         Craft::$app->getDeprecator()->log('Model::getError()', 'getError() has been deprecated. Use getFirstError() instead.');