fix duplicate auth methods

Benjamin Haeublein · Benjamin Haeublein · commit 0dc418737b13 · 2022-05-12T21:23:12.000+02:00
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/README.mustache b/modules/openapi-generator/src/main/resources/php-symfony/README.mustache
@@ -90,15 +90,15 @@ class {{baseName}}Api implements {{classname}} // An interface is autogenerated
     /**
      * Configure API key authorization: {{{name}}}
      */
-    public function set{{name}}($apiKey)
+    public function set_api_key_auth($apiKey)
     {
         // Retrieve logged in user from $apiKey ...
     }
     {{/isApiKey}}{{#isOAuth}}
     /**
      * Configure OAuth2 access token for authorization: {{{name}}}
      */
-    public function set{{name}}($oauthToken)
+    public function set_oAuth_auth($oauthToken)
     {
         // Retrieve logged in user from $oauthToken ...
     }
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api.mustache
@@ -36,13 +36,13 @@ interface {{classname}}
     {{#authMethods}}
 
     /**
-     * Sets authentication method {{name}}
+     * Sets authentication method {{#isBasic}}basic{{/isBasic}}{{#isApiKey}}api_key{{/isApiKey}}{{#isOAuth}}oAuth{{/isOAuth}}
      *
-     * @param string $value Value of the {{name}} authentication method.
+     * @param string $value Value of the {{#isBasic}}basic{{/isBasic}}{{#isApiKey}}api_key{{/isApiKey}}{{#isOAuth}}oAuth{{/isOAuth}} authentication method.
      *
      * @return void
      */
-    public function set{{name}}($value);
+    public function set_{{#isBasic}}basic{{/isBasic}}{{#isApiKey}}api_key{{/isApiKey}}{{#isOAuth}}oAuth{{/isOAuth}}_auth($value);
     {{/authMethods}}
     {{#operation}}
 
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api_controller.mustache
@@ -82,7 +82,7 @@ class {{controllerName}} extends Controller
         {{/returnType}}
         // Handle authentication
         {{#authMethods}}
-        // Authentication '{{name}}' required
+        // Authentication '{{#isBasic}}basic{{/isBasic}}{{#isApiKey}}api_key{{/isApiKey}}{{#isOAuth}}oAuth{{/isOAuth}}' required
         {{#isApiKey}}
         {{#isKeyInHeader}}
         // Set key with prefix in header
@@ -168,8 +168,8 @@ class {{controllerName}} extends Controller
             $handler = $this->getApiHandler();
 
             {{#authMethods}}
-            // Set authentication method '{{name}}'
-            $handler->set{{name}}($security{{name}});
+            // Set authentication method '{{#isBasic}}basic{{/isBasic}}{{#isApiKey}}api_key{{/isApiKey}}{{#isOAuth}}oAuth{{/isOAuth}}'
+            $handler->set_{{#isBasic}}basic{{/isBasic}}{{#isApiKey}}api_key{{/isApiKey}}{{#isOAuth}}oAuth{{/isOAuth}}_auth($security{{name}});
             {{/authMethods}}
 
             // Make the call to the business logic
diff --git a/modules/openapi-generator/src/main/resources/php-symfony/api_doc.mustache b/modules/openapi-generator/src/main/resources/php-symfony/api_doc.mustache
@@ -43,15 +43,15 @@ class {{baseName}}Api implements {{classname}}
     /**
      * Configure API key authorization: {{{name}}}
      */
-    public function set{{name}}($apiKey)
+    public function set_api_key_auth($apiKey)
     {
         // Retrieve logged in user from $apiKey ...
     }
 {{/isApiKey}}{{#isOAuth}}
     /**
      * Configure OAuth2 access token for authorization: {{{name}}}
      */
-    public function set{{name}}($oauthToken)
+    public function set_oAuth_auth($oauthToken)
     {
         // Retrieve logged in user from $oauthToken ...
     }

Original file line number	Diff line number	Diff line change
`@@ -90,15 +90,15 @@ class {{baseName}}Api implements {{classname}} // An interface is autogenerated`
`90`	`90`	`/**`
`91`	`91`	`* Configure API key authorization: {{{name}}}`
`92`	`92`	`*/`
`93`		`- public function set{{name}}($apiKey)`
	`93`	`+ public function set_api_key_auth($apiKey)`
`94`	`94`	`{`
`95`	`95`	`// Retrieve logged in user from $apiKey ...`
`96`	`96`	`}`
`97`	`97`	`{{/isApiKey}}{{#isOAuth}}`
`98`	`98`	`/**`
`99`	`99`	`* Configure OAuth2 access token for authorization: {{{name}}}`
`100`	`100`	`*/`
`101`		`- public function set{{name}}($oauthToken)`
	`101`	`+ public function set_oAuth_auth($oauthToken)`
`102`	`102`	`{`
`103`	`103`	`// Retrieve logged in user from $oauthToken ...`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,15 +43,15 @@ class {{baseName}}Api implements {{classname}}`
`43`	`43`	`/**`
`44`	`44`	`* Configure API key authorization: {{{name}}}`
`45`	`45`	`*/`
`46`		`- public function set{{name}}($apiKey)`
	`46`	`+ public function set_api_key_auth($apiKey)`
`47`	`47`	`{`
`48`	`48`	`// Retrieve logged in user from $apiKey ...`
`49`	`49`	`}`
`50`	`50`	`{{/isApiKey}}{{#isOAuth}}`
`51`	`51`	`/**`
`52`	`52`	`* Configure OAuth2 access token for authorization: {{{name}}}`
`53`	`53`	`*/`
`54`		`- public function set{{name}}($oauthToken)`
	`54`	`+ public function set_oAuth_auth($oauthToken)`
`55`	`55`	`{`
`56`	`56`	`// Retrieve logged in user from $oauthToken ...`
`57`	`57`	`}`