change the validation to allParams

2024-11-08 03:18:53 +00:00 · 2016-04-29 11:04:27 +08:00 · 2016-04-29 11:04:27 +08:00 · 72120099b4
commit 72120099b4
parent fbde7f88ee
6 changed files with 85 additions and 139 deletions
--- a/modules/swagger-codegen/src/main/resources/php/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/php/api.mustache
@ -123,6 +123,7 @@ use \{{invokerPackage}}\ObjectSerializer;
        if (${{paramName}} === null) {
            throw new \InvalidArgumentException('Missing the required parameter ${{paramName}} when calling {{operationId}}');
        }
+        {{/required}}
        {{#hasValidation}}
        {{#maxLength}}
        if (strlen(${{paramName}}) > {{maxLength}}) {
@ -151,7 +152,7 @@ use \{{invokerPackage}}\ObjectSerializer;
        {{/pattern}}

        {{/hasValidation}}
-        {{/required}}{{/allParams}}
+        {{/allParams}}
  
        // parse inputs
        $resourcePath = "{{path}}";
@ -201,33 +202,6 @@ use \{{invokerPackage}}\ObjectSerializer;

        {{#formParams}}// form params
        if (${{paramName}} !== null) {
-            {{#hasValidation}}
-            {{#maxLength}}
-            if (strlen(${{paramName}}) > {{maxLength}}) {
-                throw new \InvalidArgumentException('invalid length for "${{paramName}}" when calling {{classname}}.{{operationId}}, must be smaller than or equal to {{maxLength}}.');
-            }
-            {{/maxLength}}
-            {{#minLength}}
-            if (strlen(${{paramName}}) > {{minLength}}) {
-                throw new \InvalidArgumentException('invalid length for "${{paramName}}" when calling {{classname}}.{{operationId}}, must be bigger than or equal to {{minLength}}.');
-            }
-            {{/minLength}}
-            {{#maximum}}
-            if (${{paramName}} > {{maximum}}) {
-                throw new \InvalidArgumentException('invalid value for "${{paramName}}" when calling {{classname}}.{{operationId}}, must be smaller than or equal to {{maximum}}.');
-            }
-            {{/maximum}}
-            {{#minimum}}
-            if (${{paramName}} < {{minimum}}) {
-                throw new \InvalidArgumentException('invalid value for "${{paramName}}" when calling {{classname}}.{{operationId}}, must be bigger than or equal to {{minimum}}.');
-            }
-            {{/minimum}}
-            {{#pattern}}
-            if (!preg_match("{{pattern}}", ${{paramName}})) {
-                throw new \InvalidArgumentException('invalid value for "{{paramName}}" when calling {{classname}}.{{operationId}}, must conform to the pattern {{pattern}}.');
-            }
-            {{/pattern}}
-            {{/hasValidation}}
            {{#isFile}}
            // PHP 5.5 introduced a CurlFile object that deprecates the old @filename syntax
            // See: https://wiki.php.net/rfc/curl-file-upload
@ -240,8 +214,7 @@ use \{{invokerPackage}}\ObjectSerializer;
            {{^isFile}}
            $formParams['{{baseName}}'] = $this->apiClient->getSerializer()->toFormValue(${{paramName}});
            {{/isFile}}
-        }
-        {{/formParams}}
+        }{{/formParams}}
        {{#bodyParams}}// body params
        $_tempBody = null;
        if (isset(${{paramName}})) {
--- a/samples/client/petstore/php/SwaggerClient-php/README.md
+++ b/samples/client/petstore/php/SwaggerClient-php/README.md
@ -5,7 +5,7 @@ This PHP package is automatically generated by the [Swagger Codegen](https://git

 - API version: 1.0.0
 - Package version: 1.0.0
- Build date: 2016-04-28T02:26:28.980Z
+- Build date: 2016-04-29T03:01:58.276Z
 - Build package: class io.swagger.codegen.languages.PhpClientCodegen

 ## Requirements
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/FakeApi.php
@ -151,7 +151,7 @@ class FakeApi
            throw new \InvalidArgumentException('invalid value for "$number" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 32.1.');
        }

-        
+
        // verify the required parameter 'double' is set
        if ($double === null) {
            throw new \InvalidArgumentException('Missing the required parameter $double when calling testEndpointParameters');
@ -163,7 +163,7 @@ class FakeApi
            throw new \InvalidArgumentException('invalid value for "$double" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 67.8.');
        }

-        
+
        // verify the required parameter 'string' is set
        if ($string === null) {
            throw new \InvalidArgumentException('Missing the required parameter $string when calling testEndpointParameters');
@ -172,12 +172,36 @@ class FakeApi
            throw new \InvalidArgumentException('invalid value for "string" when calling FakeApi.testEndpointParameters, must conform to the pattern /[a-z]/i.');
        }

-        
+
        // verify the required parameter 'byte' is set
        if ($byte === null) {
            throw new \InvalidArgumentException('Missing the required parameter $byte when calling testEndpointParameters');
        }
-        
+        if ($integer > 100.0) {
+            throw new \InvalidArgumentException('invalid value for "$integer" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 100.0.');
+        }
+        if ($integer < 10.0) {
+            throw new \InvalidArgumentException('invalid value for "$integer" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 10.0.');
+        }
+
+        if ($int32 > 200.0) {
+            throw new \InvalidArgumentException('invalid value for "$int32" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 200.0.');
+        }
+        if ($int32 < 20.0) {
+            throw new \InvalidArgumentException('invalid value for "$int32" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 20.0.');
+        }
+
+        if ($float > 987.6) {
+            throw new \InvalidArgumentException('invalid value for "$float" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 987.6.');
+        }
+
+        if (strlen($password) > 64) {
+            throw new \InvalidArgumentException('invalid length for "$password" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 64.');
+        }
+        if (strlen($password) > 10) {
+            throw new \InvalidArgumentException('invalid length for "$password" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 10.');
+        }
+
  
        // parse inputs
        $resourcePath = "/fake";
@ -199,86 +223,39 @@ class FakeApi

        // form params
        if ($integer !== null) {
-            if ($integer > 100.0) {
-                throw new \InvalidArgumentException('invalid value for "$integer" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 100.0.');
-            }
-            if ($integer < 10.0) {
-                throw new \InvalidArgumentException('invalid value for "$integer" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 10.0.');
-            }
            $formParams['integer'] = $this->apiClient->getSerializer()->toFormValue($integer);
-        }
-// form params
+        }// form params
        if ($int32 !== null) {
-            if ($int32 > 200.0) {
-                throw new \InvalidArgumentException('invalid value for "$int32" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 200.0.');
-            }
-            if ($int32 < 20.0) {
-                throw new \InvalidArgumentException('invalid value for "$int32" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 20.0.');
-            }
            $formParams['int32'] = $this->apiClient->getSerializer()->toFormValue($int32);
-        }
-// form params
+        }// form params
        if ($int64 !== null) {
            $formParams['int64'] = $this->apiClient->getSerializer()->toFormValue($int64);
-        }
-// form params
+        }// form params
        if ($number !== null) {
-            if ($number > 543.2) {
-                throw new \InvalidArgumentException('invalid value for "$number" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 543.2.');
-            }
-            if ($number < 32.1) {
-                throw new \InvalidArgumentException('invalid value for "$number" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 32.1.');
-            }
            $formParams['number'] = $this->apiClient->getSerializer()->toFormValue($number);
-        }
-// form params
+        }// form params
        if ($float !== null) {
-            if ($float > 987.6) {
-                throw new \InvalidArgumentException('invalid value for "$float" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 987.6.');
-            }
            $formParams['float'] = $this->apiClient->getSerializer()->toFormValue($float);
-        }
-// form params
+        }// form params
        if ($double !== null) {
-            if ($double > 123.4) {
-                throw new \InvalidArgumentException('invalid value for "$double" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 123.4.');
-            }
-            if ($double < 67.8) {
-                throw new \InvalidArgumentException('invalid value for "$double" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 67.8.');
-            }
            $formParams['double'] = $this->apiClient->getSerializer()->toFormValue($double);
-        }
-// form params
+        }// form params
        if ($string !== null) {
-            if (!preg_match("/[a-z]/i", $string)) {
-                throw new \InvalidArgumentException('invalid value for "string" when calling FakeApi.testEndpointParameters, must conform to the pattern /[a-z]/i.');
-            }
            $formParams['string'] = $this->apiClient->getSerializer()->toFormValue($string);
-        }
-// form params
+        }// form params
        if ($byte !== null) {
            $formParams['byte'] = $this->apiClient->getSerializer()->toFormValue($byte);
-        }
-// form params
+        }// form params
        if ($binary !== null) {
            $formParams['binary'] = $this->apiClient->getSerializer()->toFormValue($binary);
-        }
-// form params
+        }// form params
        if ($date !== null) {
            $formParams['date'] = $this->apiClient->getSerializer()->toFormValue($date);
-        }
-// form params
+        }// form params
        if ($date_time !== null) {
            $formParams['dateTime'] = $this->apiClient->getSerializer()->toFormValue($date_time);
-        }
-// form params
+        }// form params
        if ($password !== null) {
-            if (strlen($password) > 64) {
-                throw new \InvalidArgumentException('invalid length for "$password" when calling FakeApi.testEndpointParameters, must be smaller than or equal to 64.');
-            }
-            if (strlen($password) > 10) {
-                throw new \InvalidArgumentException('invalid length for "$password" when calling FakeApi.testEndpointParameters, must be bigger than or equal to 10.');
-            }
            $formParams['password'] = $this->apiClient->getSerializer()->toFormValue($password);
        }
        
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/PetApi.php
@ -122,7 +122,6 @@ class PetApi
        if ($body === null) {
            throw new \InvalidArgumentException('Missing the required parameter $body when calling addPet');
        }
-        
  
        // parse inputs
        $resourcePath = "/pet";
@ -142,7 +141,8 @@ class PetApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                // body params
+        
+        // body params
        $_tempBody = null;
        if (isset($body)) {
            $_tempBody = $body;
@ -209,7 +209,6 @@ class PetApi
        if ($pet_id === null) {
            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling deletePet');
        }
-        
  
        // parse inputs
        $resourcePath = "/pet/{petId}";
@ -239,7 +238,8 @@ class PetApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -300,7 +300,6 @@ class PetApi
        if ($status === null) {
            throw new \InvalidArgumentException('Missing the required parameter $status when calling findPetsByStatus');
        }
-        
  
        // parse inputs
        $resourcePath = "/pet/findByStatus";
@ -326,7 +325,8 @@ class PetApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -394,7 +394,6 @@ class PetApi
        if ($tags === null) {
            throw new \InvalidArgumentException('Missing the required parameter $tags when calling findPetsByTags');
        }
-        
  
        // parse inputs
        $resourcePath = "/pet/findByTags";
@ -420,7 +419,8 @@ class PetApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -488,7 +488,6 @@ class PetApi
        if ($pet_id === null) {
            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling getPetById');
        }
-        
  
        // parse inputs
        $resourcePath = "/pet/{petId}";
@ -515,7 +514,8 @@ class PetApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -585,7 +585,6 @@ class PetApi
        if ($body === null) {
            throw new \InvalidArgumentException('Missing the required parameter $body when calling updatePet');
        }
-        
  
        // parse inputs
        $resourcePath = "/pet";
@ -605,7 +604,8 @@ class PetApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                // body params
+        
+        // body params
        $_tempBody = null;
        if (isset($body)) {
            $_tempBody = $body;
@ -674,7 +674,6 @@ class PetApi
        if ($pet_id === null) {
            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling updatePetWithForm');
        }
-        
  
        // parse inputs
        $resourcePath = "/pet/{petId}";
@ -704,8 +703,7 @@ class PetApi
        // form params
        if ($name !== null) {
            $formParams['name'] = $this->apiClient->getSerializer()->toFormValue($name);
-        }
-// form params
+        }// form params
        if ($status !== null) {
            $formParams['status'] = $this->apiClient->getSerializer()->toFormValue($status);
        }
@ -774,7 +772,6 @@ class PetApi
        if ($pet_id === null) {
            throw new \InvalidArgumentException('Missing the required parameter $pet_id when calling uploadFile');
        }
-        
  
        // parse inputs
        $resourcePath = "/pet/{petId}/uploadImage";
@ -804,8 +801,7 @@ class PetApi
        // form params
        if ($additional_metadata !== null) {
            $formParams['additionalMetadata'] = $this->apiClient->getSerializer()->toFormValue($additional_metadata);
-        }
-// form params
+        }// form params
        if ($file !== null) {
            // PHP 5.5 introduced a CurlFile object that deprecates the old @filename syntax
            // See: https://wiki.php.net/rfc/curl-file-upload
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/StoreApi.php
@ -126,7 +126,6 @@ class StoreApi
            throw new \InvalidArgumentException('invalid value for "$order_id" when calling StoreApi.deleteOrder, must be bigger than or equal to 1.0.');
        }

-        
  
        // parse inputs
        $resourcePath = "/store/order/{orderId}";
@ -153,7 +152,8 @@ class StoreApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -202,8 +202,7 @@ class StoreApi
     */
    public function getInventoryWithHttpInfo()
    {
-        
-  
+          
        // parse inputs
        $resourcePath = "/store/inventory";
        $httpBody = '';
@ -222,7 +221,8 @@ class StoreApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -299,7 +299,6 @@ class StoreApi
            throw new \InvalidArgumentException('invalid value for "$order_id" when calling StoreApi.getOrderById, must be bigger than or equal to 1.0.');
        }

-        
  
        // parse inputs
        $resourcePath = "/store/order/{orderId}";
@ -326,7 +325,8 @@ class StoreApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -389,7 +389,6 @@ class StoreApi
        if ($body === null) {
            throw new \InvalidArgumentException('Missing the required parameter $body when calling placeOrder');
        }
-        
  
        // parse inputs
        $resourcePath = "/store/order";
@ -409,7 +408,8 @@ class StoreApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                // body params
+        
+        // body params
        $_tempBody = null;
        if (isset($body)) {
            $_tempBody = $body;
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Api/UserApi.php
@ -122,7 +122,6 @@ class UserApi
        if ($body === null) {
            throw new \InvalidArgumentException('Missing the required parameter $body when calling createUser');
        }
-        
  
        // parse inputs
        $resourcePath = "/user";
@ -142,7 +141,8 @@ class UserApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                // body params
+        
+        // body params
        $_tempBody = null;
        if (isset($body)) {
            $_tempBody = $body;
@ -202,7 +202,6 @@ class UserApi
        if ($body === null) {
            throw new \InvalidArgumentException('Missing the required parameter $body when calling createUsersWithArrayInput');
        }
-        
  
        // parse inputs
        $resourcePath = "/user/createWithArray";
@ -222,7 +221,8 @@ class UserApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                // body params
+        
+        // body params
        $_tempBody = null;
        if (isset($body)) {
            $_tempBody = $body;
@ -282,7 +282,6 @@ class UserApi
        if ($body === null) {
            throw new \InvalidArgumentException('Missing the required parameter $body when calling createUsersWithListInput');
        }
-        
  
        // parse inputs
        $resourcePath = "/user/createWithList";
@ -302,7 +301,8 @@ class UserApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                // body params
+        
+        // body params
        $_tempBody = null;
        if (isset($body)) {
            $_tempBody = $body;
@ -362,7 +362,6 @@ class UserApi
        if ($username === null) {
            throw new \InvalidArgumentException('Missing the required parameter $username when calling deleteUser');
        }
-        
  
        // parse inputs
        $resourcePath = "/user/{username}";
@ -389,7 +388,8 @@ class UserApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -445,7 +445,6 @@ class UserApi
        if ($username === null) {
            throw new \InvalidArgumentException('Missing the required parameter $username when calling getUserByName');
        }
-        
  
        // parse inputs
        $resourcePath = "/user/{username}";
@ -472,7 +471,8 @@ class UserApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -537,12 +537,11 @@ class UserApi
        if ($username === null) {
            throw new \InvalidArgumentException('Missing the required parameter $username when calling loginUser');
        }
-        
+
        // verify the required parameter 'password' is set
        if ($password === null) {
            throw new \InvalidArgumentException('Missing the required parameter $password when calling loginUser');
        }
-        
  
        // parse inputs
        $resourcePath = "/user/login";
@ -568,7 +567,8 @@ class UserApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -624,8 +624,7 @@ class UserApi
     */
    public function logoutUserWithHttpInfo()
    {
-        
-  
+          
        // parse inputs
        $resourcePath = "/user/logout";
        $httpBody = '';
@ -644,7 +643,8 @@ class UserApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                
+        
+        
  
        // for model (json/xml)
        if (isset($_tempBody)) {
@ -702,12 +702,11 @@ class UserApi
        if ($username === null) {
            throw new \InvalidArgumentException('Missing the required parameter $username when calling updateUser');
        }
-        
+
        // verify the required parameter 'body' is set
        if ($body === null) {
            throw new \InvalidArgumentException('Missing the required parameter $body when calling updateUser');
        }
-        
  
        // parse inputs
        $resourcePath = "/user/{username}";
@ -734,7 +733,8 @@ class UserApi
        // default format to json
        $resourcePath = str_replace("{format}", "json", $resourcePath);

-                // body params
+        
+        // body params
        $_tempBody = null;
        if (isset($body)) {
            $_tempBody = $body;