Merge branch '2.12.x' into 2.13.x

Conflicts: CHANGELOG.md
laminas · Aug 12, 2020 · abd10ef · abd10ef
2 parents f3f69c6 + c154a73
commit abd10ef
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/.github/workflows/release-on-milestone-closed.yml b/.github/workflows/release-on-milestone-closed.yml
@@ -17,7 +17,7 @@ jobs:
         uses: "actions/checkout@v2"
 
       - name: "Release"
-        uses: "laminas/automatic-releases@1.0.1"
+        uses: "laminas/automatic-releases@v1"
         with:
           command-name: "laminas:automatic-releases:release"
         env:
@@ -27,7 +27,7 @@ jobs:
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
       - name: "Create Merge-Up Pull Request"
-        uses: "laminas/automatic-releases@1.0.1"
+        uses: "laminas/automatic-releases@v1"
         with:
           command-name: "laminas:automatic-releases:create-merge-up-pull-request"
         env:
@@ -37,7 +37,7 @@ jobs:
           "GIT_AUTHOR_EMAIL": ${{ secrets.GIT_AUTHOR_EMAIL }}
 
       - name: "Create and/or Switch to new Release Branch"
-        uses: "laminas/automatic-releases@1.0.1"
+        uses: "laminas/automatic-releases@v1"
         with:
           command-name: "laminas:automatic-releases:switch-default-branch-to-next-minor"
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,28 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 2.12.3 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#107](https://github.com/laminas/laminas-mail/pull/107) corrects a return type annotation in Laminas\Mail\Address\AddressInterface and in implementer.
+
 ## 2.12.2 - 2020-08-06
 
 ### Added

diff --git a/src/Address.php b/src/Address.php
@@ -108,9 +108,9 @@ public function getEmail()
     }
 
     /**
-     * Retrieve name
+     * Retrieve name, if any
      *
-     * @return string
+     * @return null|string
      */
     public function getName()
     {

diff --git a/src/Address/AddressInterface.php b/src/Address/AddressInterface.php
@@ -18,9 +18,9 @@ interface AddressInterface
     public function getEmail();
 
     /**
-     * Retrieve name
+     * Retrieve name, if any
      *
-     * @return string
+     * @return null|string
      */
     public function getName();