Merge branch 'master' into upgrade-sf5

src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php

@@ -655,7 +655,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
         throw new \UnexpectedValueException(sprintf('typeAndCategory should be a string or a %s', ThirdPartyCategory::class));
     }
 
-    public function setAcronym(string $acronym = null): ThirdParty
+    public function setAcronym(?string $acronym = null): ThirdParty
     {
         $this->acronym = (string) $acronym;
 
@@ -679,7 +679,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * @return $this
      */
-    public function setAddress(Address $address = null)
+    public function setAddress(?Address $address = null)
     {
         $this->address = $address;
 
@@ -716,7 +716,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
      *
      * @return ThirdParty
      */
-    public function setComment(string $comment = null)
+    public function setComment(?string $comment = null)
     {
         $this->comment = $comment;
 
@@ -754,7 +754,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
      *
      * @return ThirdParty
      */
-    public function setEmail(string $email = null)
+    public function setEmail(?string $email = null)
     {
         $this->email = trim((string) $email);
 
@@ -806,7 +806,7 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
     /**
      * Set telephone.
      */
-    public function setTelephone(PhoneNumber $telephone = null): self
+    public function setTelephone(?PhoneNumber $telephone = null): self
     {
         $this->telephone = $telephone;