Merge branch '4.3' into 4.4

* 4.3:
  Remove superfluous phpdoc tags

Author: nicolas-grekas

Header/MailboxHeader.php

@@ -59,9 +59,6 @@ public function setAddress(Address $address)
         $this->address = $address;
     }
 
-    /**
-     * @return Address
-     */
     public function getAddress(): Address
     {
         return $this->address;

Test/Constraint/EmailHtmlBodyContains.php

@@ -31,9 +31,9 @@ public function toString(): string
     }
 
     /**
-     * @param RawMessage $message
-     *
      * {@inheritdoc}
+     *
+     * @param RawMessage $message
      */
     protected function matches($message): bool
     {
@@ -45,11 +45,11 @@ protected function matches($message): bool
     }
 
     /**
-     * @param RawMessage $message
-     *
      * {@inheritdoc}
+     *
+     * @param RawMessage $message
      */
-    protected function failureDescription($email): string
+    protected function failureDescription($message): string
     {
         return 'the Email HTML body '.$this->toString();
     }

Test/Constraint/EmailTextBodyContains.php

@@ -31,9 +31,9 @@ public function toString(): string
     }
 
     /**
-     * @param RawMessage $message
-     *
      * {@inheritdoc}
+     *
+     * @param RawMessage $message
      */
     protected function matches($message): bool
     {
@@ -45,11 +45,11 @@ protected function matches($message): bool
     }
 
     /**
-     * @param RawMessage $message
-     *
      * {@inheritdoc}
+     *
+     * @param RawMessage $message
      */
-    protected function failureDescription($email): string
+    protected function failureDescription($message): string
     {
         return 'the Email text body '.$this->toString();
     }