Merge remote-tracking branch 'origin/master' into 5.0-sync-master

This commit is contained in:
William Cheng
2020-04-17 15:51:00 +08:00
4730 changed files with 208746 additions and 53119 deletions

View File

@@ -1 +1,5 @@
5.0.0-SNAPSHOT
<<<<<<< HEAD
5.0.0-SNAPSHOT
=======
4.3.1-SNAPSHOT
>>>>>>> origin/master

View File

@@ -185,7 +185,7 @@ class Order
*
* @return \DateTime|null
*/
public function getShipDate()
public function getShipDate(): ?\DateTime
{
return $this->shipDate;
}
@@ -197,7 +197,7 @@ class Order
*
* @return $this
*/
public function setShipDate(\DateTime $shipDate = null)
public function setShipDate(\DateTime $shipDate = null): ?\DateTime
{
$this->shipDate = $shipDate;

View File

@@ -143,7 +143,7 @@ class Pet
*
* @return OpenAPI\Server\Model\Category|null
*/
public function getCategory()
public function getCategory(): ?Category
{
return $this->category;
}
@@ -155,7 +155,7 @@ class Pet
*
* @return $this
*/
public function setCategory(Category $category = null)
public function setCategory(Category $category = null): ?Category
{
$this->category = $category;
@@ -191,7 +191,7 @@ class Pet
*
* @return string[]
*/
public function getPhotoUrls()
public function getPhotoUrls(): array
{
return $this->photoUrls;
}
@@ -203,7 +203,7 @@ class Pet
*
* @return $this
*/
public function setPhotoUrls(array $photoUrls)
public function setPhotoUrls(array $photoUrls): array
{
$this->photoUrls = $photoUrls;
@@ -215,7 +215,7 @@ class Pet
*
* @return OpenAPI\Server\Model\Tag[]|null
*/
public function getTags()
public function getTags(): ?array
{
return $this->tags;
}
@@ -227,7 +227,7 @@ class Pet
*
* @return $this
*/
public function setTags(array $tags = null)
public function setTags(array $tags = null): ?array
{
$this->tags = $tags;