update reserved words for php and ruby to include local variable names

in api methods

Author: wing328

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java

@@ -47,7 +47,12 @@ public PhpClientCodegen() {
 
         reservedWords = new HashSet<String>(
                 Arrays.asList(
-                        "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor")
+                    // local variables used in api methods (endpoints)
+                    "resourcePath", "method", "httpBody", "queryParams", "headerParams",
+                    "formParams", "_header_accept", "_tempBody",
+
+                    // PHP reserved words
+                    "__halt_compiler", "abstract", "and", "array", "as", "break", "callable", "case", "catch", "class", "clone", "const", "continue", "declare", "default", "die", "do", "echo", "else", "elseif", "empty", "enddeclare", "endfor", "endforeach", "endif", "endswitch", "endwhile", "eval", "exit", "extends", "final", "for", "foreach", "function", "global", "goto", "if", "implements", "include", "include_once", "instanceof", "insteadof", "interface", "isset", "list", "namespace", "new", "or", "print", "private", "protected", "public", "require", "require_once", "return", "static", "switch", "throw", "trait", "try", "unset", "use", "var", "while", "xor")
         );
 
         // ref: http://php.net/manual/en/language.types.intro.php

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RubyClientCodegen.java

@@ -38,11 +38,15 @@ public RubyClientCodegen() {
 
         reservedWords = new HashSet<String>(
                 Arrays.asList(
-                        "__FILE__", "and", "def", "end", "in", "or", "self", "unless", "__LINE__",
-                        "begin", "defined?", "ensure", "module", "redo", "super", "until", "BEGIN",
-                        "break", "do", "false", "next", "rescue", "then", "when", "END", "case",
-                        "else", "for", "nil", "retry", "true", "while", "alias", "class", "elsif",
-                        "if", "not", "return", "undef", "yield")
+                    // local variable names used in API methods (endpoints)
+                    "path", "query_params", "header_params", "_header_accept", "_header_accept_result",
+                    "_header_content_type", "form_params", "post_body", "auth_names",
+                    // ruby reserved keywords
+                    "__FILE__", "and", "def", "end", "in", "or", "self", "unless", "__LINE__",
+                    "begin", "defined?", "ensure", "module", "redo", "super", "until", "BEGIN",
+                    "break", "do", "false", "next", "rescue", "then", "when", "END", "case",
+                    "else", "for", "nil", "retry", "true", "while", "alias", "class", "elsif",
+                    "if", "not", "return", "undef", "yield")
         );
 
         languageSpecificPrimitives.add("int");

samples/client/petstore/php/SwaggerClient-php/lib/ObjectSerializer.php

@@ -226,7 +226,7 @@ public function deserialize($data, $class, $httpHeader=null)
             $deserialized = $values;
         } elseif ($class === '\DateTime') {
             $deserialized = new \DateTime($data);
-        } elseif (in_array($class, array('void', 'bool', 'string', 'double', 'byte', 'mixed', 'integer', 'float', 'int', 'DateTime', 'number', 'boolean', 'object'))) {
+        } elseif (in_array($class, array('integer', 'int', 'void', 'number', 'object', 'double', 'float', 'byte', 'DateTime', 'string', 'mixed', 'boolean', 'bool'))) {
             settype($data, $class);
             $deserialized = $data;
         } elseif ($class === '\SplFileObject') {

samples/client/petstore/ruby/lib/petstore.rb

@@ -13,8 +13,8 @@
 
 # APIs
 require 'petstore/api/user_api'
-require 'petstore/api/store_api'
 require 'petstore/api/pet_api'
+require 'petstore/api/store_api'
 
 module Petstore
   class << self

samples/client/petstore/ruby/lib/petstore/configuration.rb

@@ -157,20 +157,20 @@ def basic_auth_token
     # Returns Auth Settings hash for api client.
     def auth_settings
       {
-        'petstore_auth' =>
-          {
-            type: 'oauth2',
-            in: 'header',
-            key: 'Authorization',
-            value: "Bearer #{access_token}"
-          },
         'api_key' =>
           {
             type: 'api_key',
             in: 'header',
             key: 'api_key',
             value: api_key_with_prefix('api_key')
           },
+        'petstore_auth' =>
+          {
+            type: 'oauth2',
+            in: 'header',
+            key: 'Authorization',
+            value: "Bearer #{access_token}"
+          },
       }
     end
   end