Merge branch 'hotfix/94' into develop

Forward port #94

Conflicts:
	CHANGELOG.md

Author: weierophinney

CHANGELOG.md

@@ -26,7 +26,7 @@ Releases prior to 1.2.0 did not have entries.
 
 - Nothing.
 
-## 1.3.1 - TBD
+## 1.3.1 - 2018-09-17
 
 ### Added
 
@@ -46,7 +46,11 @@ Releases prior to 1.2.0 did not have entries.
 
 ### Fixed
 
-- Nothing.
+- [#94](https://github.com/zendframework/zenddiagnostics/pull/94) updates the
+  `AbstractResult::$message` property to default to an empty string instead of
+  `null`. Since both `ResultInterface` and `AbstractResult` document that the
+  return type for `getMessage()` is a string, and all reporters expect a string,
+  this ensures type safety for the method.
 
 ## 1.3.0 - 2018-07-30
 

src/Result/AbstractResult.php

@@ -13,7 +13,7 @@
 abstract class AbstractResult implements ResultInterface
 {
     /**
-     * @var string|null
+     * @var string
      */
     protected $message;
 
@@ -25,14 +25,12 @@ abstract class AbstractResult implements ResultInterface
     /**
      * Create new result
      *
-     * @param string|null $message
+     * @param string      $message
      * @param mixed|null  $data
      */
-    public function __construct($message = null, $data = null)
+    public function __construct($message = '', $data = null)
     {
-        if ($message !== null) {
-            $this->setMessage($message);
-        }
+        $this->setMessage($message);
 
         if ($data !== null) {
             $this->setData($data);
@@ -68,7 +66,7 @@ public function setData($data)
     }
 
     /**
-     * @param null|string $message
+     * @param string $message
      */
     public function setMessage($message)
     {

test/BasicClassesTest.php

@@ -77,7 +77,7 @@ public function testConstructor()
     public function testSetters()
     {
         $result = new Success();
-        $this->assertSame(null, $result->getMessage());
+        $this->assertSame('', $result->getMessage());
         $this->assertSame(null, $result->getData());
 
         $result->setMessage('foo');