Merge remote-tracking branch 'origin/master' into 4.0.x

2018-11-18 18:54:29 +08:00
parent 334415dec2 7f8ff35245
commit 65a86eee3b
100 changed files with 12417 additions and 3221 deletions
--- a/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Pet.php
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/Model/Pet.php
@@ -203,7 +203,7 @@ class Pet
     *
     * @return $this
     */
-    public function setPhotoUrls($photoUrls)
+    public function setPhotoUrls(array $photoUrls)
    {
        $this->photoUrls = $photoUrls;

@@ -227,7 +227,7 @@ class Pet
     *
     * @return $this
     */
-    public function setTags(Tag $tags = null)
+    public function setTags(array $tags = null)
    {
        $this->tags = $tags;