fix php ordering issue for CodegenSecurity (#5001)

OpenAPITools · Jan 15, 2020 · fe8775a · fe8775a
1 parent 50f7e14
commit fe8775a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/...i-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/...i-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java
@@ -386,7 +386,7 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
         operations.put("controllerName", toControllerName((String) operations.get("pathPrefix")));
         operations.put("symfonyService", toSymfonyService((String) operations.get("pathPrefix")));
 
-        HashSet<CodegenSecurity> authMethods = new HashSet<>();
+        List<CodegenSecurity> authMethods = new ArrayList<CodegenSecurity>();
         List<CodegenOperation> operationList = (List<CodegenOperation>) operations.get("operation");
 
         for (CodegenOperation op : operationList) {
@@ -431,7 +431,11 @@ public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> o
 
             // Add operation's authentication methods to whole interface
             if (op.authMethods != null) {
-                authMethods.addAll(op.authMethods);
+                for (CodegenSecurity am : op.authMethods) {
+                    if (!authMethods.contains(am)) {
+                        authMethods.add(am);
+                    }
+                }
             }
         }
 

diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php b/samples/server/petstore/php-symfony/SymfonyBundle-php/Api/PetApiInterface.php
@@ -44,22 +44,22 @@ interface PetApiInterface
 {
 
     /**
-     * Sets authentication method api_key
+     * Sets authentication method petstore_auth
      *
-     * @param string $value Value of the api_key authentication method.
+     * @param string $value Value of the petstore_auth authentication method.
      *
      * @return void
      */
-    public function setapi_key($value);
+    public function setpetstore_auth($value);
 
     /**
-     * Sets authentication method petstore_auth
+     * Sets authentication method api_key
      *
-     * @param string $value Value of the petstore_auth authentication method.
+     * @param string $value Value of the api_key authentication method.
      *
      * @return void
      */
-    public function setpetstore_auth($value);
+    public function setapi_key($value);
 
     /**
      * Operation addPet