Add return self type hint for setters

reznikartem · reznikartem · commit 07dd97158f9f · 2020-04-29T16:37:09.000+02:00
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/model_generic.mustache b/modules/openapi-generator/src/main/resources/php-symfony/model_generic.mustache
@@ -35,7 +35,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}
      *
      * @return $this
      */
-    public function {{setter}}({{#vendorExtensions.x-parameter-type}}{{vendorExtensions.x-parameter-type}} {{/vendorExtensions.x-parameter-type}}${{name}}{{^required}} = null{{/required}})
+    public function {{setter}}({{#vendorExtensions.x-parameter-type}}{{vendorExtensions.x-parameter-type}} {{/vendorExtensions.x-parameter-type}}${{name}}{{^required}} = null{{/required}}): self
     {
         $this->{{name}} = ${{name}};
 
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/ApiResponse.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/ApiResponse.php
@@ -95,7 +95,7 @@ public function getCode()
      *
      * @return $this
      */
-    public function setCode($code = null)
+    public function setCode($code = null): self
     {
         $this->code = $code;
 
@@ -119,7 +119,7 @@ public function getType()
      *
      * @return $this
      */
-    public function setType($type = null)
+    public function setType($type = null): self
     {
         $this->type = $type;
 
@@ -143,7 +143,7 @@ public function getMessage()
      *
      * @return $this
      */
-    public function setMessage($message = null)
+    public function setMessage($message = null): self
     {
         $this->message = $message;
 
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Category.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Category.php
@@ -86,7 +86,7 @@ public function getId()
      *
      * @return $this
      */
-    public function setId($id = null)
+    public function setId($id = null): self
     {
         $this->id = $id;
 
@@ -110,7 +110,7 @@ public function getName()
      *
      * @return $this
      */
-    public function setName($name = null)
+    public function setName($name = null): self
     {
         $this->name = $name;
 
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Order.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Order.php
@@ -125,7 +125,7 @@ public function getId()
      *
      * @return $this
      */
-    public function setId($id = null)
+    public function setId($id = null): self
     {
         $this->id = $id;
 
@@ -149,7 +149,7 @@ public function getPetId()
      *
      * @return $this
      */
-    public function setPetId($petId = null)
+    public function setPetId($petId = null): self
     {
         $this->petId = $petId;
 
@@ -173,7 +173,7 @@ public function getQuantity()
      *
      * @return $this
      */
-    public function setQuantity($quantity = null)
+    public function setQuantity($quantity = null): self
     {
         $this->quantity = $quantity;
 
@@ -197,7 +197,7 @@ public function getShipDate(): ?\DateTime
      *
      * @return $this
      */
-    public function setShipDate(\DateTime $shipDate = null)
+    public function setShipDate(\DateTime $shipDate = null): self
     {
         $this->shipDate = $shipDate;
 
@@ -221,7 +221,7 @@ public function getStatus()
      *
      * @return $this
      */
-    public function setStatus($status = null)
+    public function setStatus($status = null): self
     {
         $this->status = $status;
 
@@ -245,7 +245,7 @@ public function isComplete()
      *
      * @return $this
      */
-    public function setComplete($complete = null)
+    public function setComplete($complete = null): self
     {
         $this->complete = $complete;
 
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Pet.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Pet.php
@@ -131,7 +131,7 @@ public function getId()
      *
      * @return $this
      */
-    public function setId($id = null)
+    public function setId($id = null): self
     {
         $this->id = $id;
 
@@ -155,7 +155,7 @@ public function getCategory(): ?Category
      *
      * @return $this
      */
-    public function setCategory(Category $category = null)
+    public function setCategory(Category $category = null): self
     {
         $this->category = $category;
 
@@ -179,7 +179,7 @@ public function getName()
      *
      * @return $this
      */
-    public function setName($name)
+    public function setName($name): self
     {
         $this->name = $name;
 
@@ -203,7 +203,7 @@ public function getPhotoUrls(): array
      *
      * @return $this
      */
-    public function setPhotoUrls(array $photoUrls)
+    public function setPhotoUrls(array $photoUrls): self
     {
         $this->photoUrls = $photoUrls;
 
@@ -227,7 +227,7 @@ public function getTags(): ?array
      *
      * @return $this
      */
-    public function setTags(array $tags = null)
+    public function setTags(array $tags = null): self
     {
         $this->tags = $tags;
 
@@ -251,7 +251,7 @@ public function getStatus()
      *
      * @return $this
      */
-    public function setStatus($status = null)
+    public function setStatus($status = null): self
     {
         $this->status = $status;
 
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Tag.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Tag.php
@@ -86,7 +86,7 @@ public function getId()
      *
      * @return $this
      */
-    public function setId($id = null)
+    public function setId($id = null): self
     {
         $this->id = $id;
 
@@ -110,7 +110,7 @@ public function getName()
      *
      * @return $this
      */
-    public function setName($name = null)
+    public function setName($name = null): self
     {
         $this->name = $name;
 
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/User.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/User.php
@@ -142,7 +142,7 @@ public function getId()
      *
      * @return $this
      */
-    public function setId($id = null)
+    public function setId($id = null): self
     {
         $this->id = $id;
 
@@ -166,7 +166,7 @@ public function getUsername()
      *
      * @return $this
      */
-    public function setUsername($username = null)
+    public function setUsername($username = null): self
     {
         $this->username = $username;
 
@@ -190,7 +190,7 @@ public function getFirstName()
      *
      * @return $this
      */
-    public function setFirstName($firstName = null)
+    public function setFirstName($firstName = null): self
     {
         $this->firstName = $firstName;
 
@@ -214,7 +214,7 @@ public function getLastName()
      *
      * @return $this
      */
-    public function setLastName($lastName = null)
+    public function setLastName($lastName = null): self
     {
         $this->lastName = $lastName;
 
@@ -238,7 +238,7 @@ public function getEmail()
      *
      * @return $this
      */
-    public function setEmail($email = null)
+    public function setEmail($email = null): self
     {
         $this->email = $email;
 
@@ -262,7 +262,7 @@ public function getPassword()
      *
      * @return $this
      */
-    public function setPassword($password = null)
+    public function setPassword($password = null): self
     {
         $this->password = $password;
 
@@ -286,7 +286,7 @@ public function getPhone()
      *
      * @return $this
      */
-    public function setPhone($phone = null)
+    public function setPhone($phone = null): self
     {
         $this->phone = $phone;
 
@@ -310,7 +310,7 @@ public function getUserStatus()
      *
      * @return $this
      */
-    public function setUserStatus($userStatus = null)
+    public function setUserStatus($userStatus = null): self
     {
         $this->userStatus = $userStatus;
 

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class {{classname}} {{#parentSchema}}extends {{{parent}}} {{/parentSchema}}`
`35`	`35`	`*`
`36`	`36`	`* @return $this`
`37`	`37`	`*/`
`38`		`- public function {{setter}}({{#vendorExtensions.x-parameter-type}}{{vendorExtensions.x-parameter-type}} {{/vendorExtensions.x-parameter-type}}${{name}}{{^required}} = null{{/required}})`
	`38`	`+ public function {{setter}}({{#vendorExtensions.x-parameter-type}}{{vendorExtensions.x-parameter-type}} {{/vendorExtensions.x-parameter-type}}${{name}}{{^required}} = null{{/required}}): self`
`39`	`39`	`{`
`40`	`40`	`$this->{{name}} = ${{name}};`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function getCode()`
`95`	`95`	`*`
`96`	`96`	`* @return $this`
`97`	`97`	`*/`
`98`		`- public function setCode($code = null)`
	`98`	`+ public function setCode($code = null): self`
`99`	`99`	`{`
`100`	`100`	`$this->code = $code;`
`101`	`101`
`@@ -119,7 +119,7 @@ public function getType()`
`119`	`119`	`*`
`120`	`120`	`* @return $this`
`121`	`121`	`*/`
`122`		`- public function setType($type = null)`
	`122`	`+ public function setType($type = null): self`
`123`	`123`	`{`
`124`	`124`	`$this->type = $type;`
`125`	`125`
`@@ -143,7 +143,7 @@ public function getMessage()`
`143`	`143`	`*`
`144`	`144`	`* @return $this`
`145`	`145`	`*/`
`146`		`- public function setMessage($message = null)`
	`146`	`+ public function setMessage($message = null): self`
`147`	`147`	`{`
`148`	`148`	`$this->message = $message;`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function getId()`
`86`	`86`	`*`
`87`	`87`	`* @return $this`
`88`	`88`	`*/`
`89`		`- public function setId($id = null)`
	`89`	`+ public function setId($id = null): self`
`90`	`90`	`{`
`91`	`91`	`$this->id = $id;`
`92`	`92`
`@@ -110,7 +110,7 @@ public function getName()`
`110`	`110`	`*`
`111`	`111`	`* @return $this`
`112`	`112`	`*/`
`113`		`- public function setName($name = null)`
	`113`	`+ public function setName($name = null): self`
`114`	`114`	`{`
`115`	`115`	`$this->name = $name;`
`116`	`116`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function getId()`
`125`	`125`	`*`
`126`	`126`	`* @return $this`
`127`	`127`	`*/`
`128`		`- public function setId($id = null)`
	`128`	`+ public function setId($id = null): self`
`129`	`129`	`{`
`130`	`130`	`$this->id = $id;`
`131`	`131`
`@@ -149,7 +149,7 @@ public function getPetId()`
`149`	`149`	`*`
`150`	`150`	`* @return $this`
`151`	`151`	`*/`
`152`		`- public function setPetId($petId = null)`
	`152`	`+ public function setPetId($petId = null): self`
`153`	`153`	`{`
`154`	`154`	`$this->petId = $petId;`
`155`	`155`
`@@ -173,7 +173,7 @@ public function getQuantity()`
`173`	`173`	`*`
`174`	`174`	`* @return $this`
`175`	`175`	`*/`
`176`		`- public function setQuantity($quantity = null)`
	`176`	`+ public function setQuantity($quantity = null): self`
`177`	`177`	`{`
`178`	`178`	`$this->quantity = $quantity;`
`179`	`179`
`@@ -197,7 +197,7 @@ public function getShipDate(): ?\DateTime`
`197`	`197`	`*`
`198`	`198`	`* @return $this`
`199`	`199`	`*/`
`200`		`- public function setShipDate(\DateTime $shipDate = null)`
	`200`	`+ public function setShipDate(\DateTime $shipDate = null): self`
`201`	`201`	`{`
`202`	`202`	`$this->shipDate = $shipDate;`
`203`	`203`
`@@ -221,7 +221,7 @@ public function getStatus()`
`221`	`221`	`*`
`222`	`222`	`* @return $this`
`223`	`223`	`*/`
`224`		`- public function setStatus($status = null)`
	`224`	`+ public function setStatus($status = null): self`
`225`	`225`	`{`
`226`	`226`	`$this->status = $status;`
`227`	`227`
`@@ -245,7 +245,7 @@ public function isComplete()`
`245`	`245`	`*`
`246`	`246`	`* @return $this`
`247`	`247`	`*/`
`248`		`- public function setComplete($complete = null)`
	`248`	`+ public function setComplete($complete = null): self`
`249`	`249`	`{`
`250`	`250`	`$this->complete = $complete;`
`251`	`251`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public function getId()`
`131`	`131`	`*`
`132`	`132`	`* @return $this`
`133`	`133`	`*/`
`134`		`- public function setId($id = null)`
	`134`	`+ public function setId($id = null): self`
`135`	`135`	`{`
`136`	`136`	`$this->id = $id;`
`137`	`137`
`@@ -155,7 +155,7 @@ public function getCategory(): ?Category`
`155`	`155`	`*`
`156`	`156`	`* @return $this`
`157`	`157`	`*/`
`158`		`- public function setCategory(Category $category = null)`
	`158`	`+ public function setCategory(Category $category = null): self`
`159`	`159`	`{`
`160`	`160`	`$this->category = $category;`
`161`	`161`
`@@ -179,7 +179,7 @@ public function getName()`
`179`	`179`	`*`
`180`	`180`	`* @return $this`
`181`	`181`	`*/`
`182`		`- public function setName($name)`
	`182`	`+ public function setName($name): self`
`183`	`183`	`{`
`184`	`184`	`$this->name = $name;`
`185`	`185`
`@@ -203,7 +203,7 @@ public function getPhotoUrls(): array`
`203`	`203`	`*`
`204`	`204`	`* @return $this`
`205`	`205`	`*/`
`206`		`- public function setPhotoUrls(array $photoUrls)`
	`206`	`+ public function setPhotoUrls(array $photoUrls): self`
`207`	`207`	`{`
`208`	`208`	`$this->photoUrls = $photoUrls;`
`209`	`209`
`@@ -227,7 +227,7 @@ public function getTags(): ?array`
`227`	`227`	`*`
`228`	`228`	`* @return $this`
`229`	`229`	`*/`
`230`		`- public function setTags(array $tags = null)`
	`230`	`+ public function setTags(array $tags = null): self`
`231`	`231`	`{`
`232`	`232`	`$this->tags = $tags;`
`233`	`233`
`@@ -251,7 +251,7 @@ public function getStatus()`
`251`	`251`	`*`
`252`	`252`	`* @return $this`
`253`	`253`	`*/`
`254`		`- public function setStatus($status = null)`
	`254`	`+ public function setStatus($status = null): self`
`255`	`255`	`{`
`256`	`256`	`$this->status = $status;`
`257`	`257`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function getId()`
`142`	`142`	`*`
`143`	`143`	`* @return $this`
`144`	`144`	`*/`
`145`		`- public function setId($id = null)`
	`145`	`+ public function setId($id = null): self`
`146`	`146`	`{`
`147`	`147`	`$this->id = $id;`
`148`	`148`
`@@ -166,7 +166,7 @@ public function getUsername()`
`166`	`166`	`*`
`167`	`167`	`* @return $this`
`168`	`168`	`*/`
`169`		`- public function setUsername($username = null)`
	`169`	`+ public function setUsername($username = null): self`
`170`	`170`	`{`
`171`	`171`	`$this->username = $username;`
`172`	`172`
`@@ -190,7 +190,7 @@ public function getFirstName()`
`190`	`190`	`*`
`191`	`191`	`* @return $this`
`192`	`192`	`*/`
`193`		`- public function setFirstName($firstName = null)`
	`193`	`+ public function setFirstName($firstName = null): self`
`194`	`194`	`{`
`195`	`195`	`$this->firstName = $firstName;`
`196`	`196`
`@@ -214,7 +214,7 @@ public function getLastName()`
`214`	`214`	`*`
`215`	`215`	`* @return $this`
`216`	`216`	`*/`
`217`		`- public function setLastName($lastName = null)`
	`217`	`+ public function setLastName($lastName = null): self`
`218`	`218`	`{`
`219`	`219`	`$this->lastName = $lastName;`
`220`	`220`
`@@ -238,7 +238,7 @@ public function getEmail()`
`238`	`238`	`*`
`239`	`239`	`* @return $this`
`240`	`240`	`*/`
`241`		`- public function setEmail($email = null)`
	`241`	`+ public function setEmail($email = null): self`
`242`	`242`	`{`
`243`	`243`	`$this->email = $email;`
`244`	`244`
`@@ -262,7 +262,7 @@ public function getPassword()`
`262`	`262`	`*`
`263`	`263`	`* @return $this`
`264`	`264`	`*/`
`265`		`- public function setPassword($password = null)`
	`265`	`+ public function setPassword($password = null): self`
`266`	`266`	`{`
`267`	`267`	`$this->password = $password;`
`268`	`268`
`@@ -286,7 +286,7 @@ public function getPhone()`
`286`	`286`	`*`
`287`	`287`	`* @return $this`
`288`	`288`	`*/`
`289`		`- public function setPhone($phone = null)`
	`289`	`+ public function setPhone($phone = null): self`
`290`	`290`	`{`
`291`	`291`	`$this->phone = $phone;`
`292`	`292`
`@@ -310,7 +310,7 @@ public function getUserStatus()`
`310`	`310`	`*`
`311`	`311`	`* @return $this`
`312`	`312`	`*/`
`313`		`- public function setUserStatus($userStatus = null)`
	`313`	`+ public function setUserStatus($userStatus = null): self`
`314`	`314`	`{`
`315`	`315`	`$this->userStatus = $userStatus;`
`316`	`316`