forked from loafle/openapi-generator-original
		
	minor enhancements to php symfony 6 generator (#12455)
This commit is contained in:
		
							parent
							
								
									16365ac989
								
							
						
					
					
						commit
						621f87b5e6
					
				@ -1001,6 +1001,7 @@ Here is a list of template creators:
 | 
				
			|||||||
   * PHP Slim: @jfastnacht
 | 
					   * PHP Slim: @jfastnacht
 | 
				
			||||||
   * PHP Slim4: [@ybelenko](https://github.com/ybelenko)
 | 
					   * PHP Slim4: [@ybelenko](https://github.com/ybelenko)
 | 
				
			||||||
   * PHP Symfony: @ksm2
 | 
					   * PHP Symfony: @ksm2
 | 
				
			||||||
 | 
					   * PHP Symfony6: @BenjaminHae
 | 
				
			||||||
   * Python FastAPI: @krjakbrjak
 | 
					   * Python FastAPI: @krjakbrjak
 | 
				
			||||||
   * Python AIOHTTP:
 | 
					   * Python AIOHTTP:
 | 
				
			||||||
   * Ruby on Rails 5: @zlx
 | 
					   * Ruby on Rails 5: @zlx
 | 
				
			||||||
 | 
				
			|||||||
@ -356,7 +356,6 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        // Testing components
 | 
					        // Testing components
 | 
				
			||||||
        supportingFiles.add(new SupportingFile("testing/phpunit.xml.mustache", "", "phpunit.xml.dist"));
 | 
					        supportingFiles.add(new SupportingFile("testing/phpunit.xml.mustache", "", "phpunit.xml.dist"));
 | 
				
			||||||
        supportingFiles.add(new SupportingFile("testing/pom.xml", "", "pom.xml"));
 | 
					 | 
				
			||||||
        supportingFiles.add(new SupportingFile("testing/AppKernel.mustache", toSrcPath(testsPackage, srcBasePath), "AppKernel.php"));
 | 
					        supportingFiles.add(new SupportingFile("testing/AppKernel.mustache", toSrcPath(testsPackage, srcBasePath), "AppKernel.php"));
 | 
				
			||||||
        supportingFiles.add(new SupportingFile("testing/ControllerTest.mustache", toSrcPath(controllerTestsPackage, srcBasePath), "ControllerTest.php"));
 | 
					        supportingFiles.add(new SupportingFile("testing/ControllerTest.mustache", toSrcPath(controllerTestsPackage, srcBasePath), "ControllerTest.php"));
 | 
				
			||||||
        supportingFiles.add(new SupportingFile("testing/test_config.yml", toSrcPath(testsPackage, srcBasePath), "test_config.yml"));
 | 
					        supportingFiles.add(new SupportingFile("testing/test_config.yml", toSrcPath(testsPackage, srcBasePath), "test_config.yml"));
 | 
				
			||||||
@ -442,8 +441,7 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg
 | 
				
			|||||||
                } else {
 | 
					                } else {
 | 
				
			||||||
                    if (defaultIncludes.contains(op.returnType)) {
 | 
					                    if (defaultIncludes.contains(op.returnType)) {
 | 
				
			||||||
                        op.vendorExtensions.put("x-return-type", "array|" + op.returnType);
 | 
					                        op.vendorExtensions.put("x-return-type", "array|" + op.returnType);
 | 
				
			||||||
                    }
 | 
					                    } else {
 | 
				
			||||||
                    else {
 | 
					 | 
				
			||||||
                        op.vendorExtensions.put("x-return-type", "array|\\" + op.returnType);
 | 
					                        op.vendorExtensions.put("x-return-type", "array|\\" + op.returnType);
 | 
				
			||||||
                    }
 | 
					                    }
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
 | 
				
			|||||||
@ -1,57 +0,0 @@
 | 
				
			|||||||
<project>
 | 
					 | 
				
			||||||
    <modelVersion>4.0.0</modelVersion>
 | 
					 | 
				
			||||||
    <groupId>com.penneo</groupId>
 | 
					 | 
				
			||||||
    <artifactId>PhpSymfonyPetstoreServerTests</artifactId>
 | 
					 | 
				
			||||||
    <packaging>pom</packaging>
 | 
					 | 
				
			||||||
    <version>1.0-SNAPSHOT</version>
 | 
					 | 
				
			||||||
    <name>PHP Symfony Petstore Server</name>
 | 
					 | 
				
			||||||
    <build>
 | 
					 | 
				
			||||||
        <plugins>
 | 
					 | 
				
			||||||
            <plugin>
 | 
					 | 
				
			||||||
                <artifactId>maven-dependency-plugin</artifactId>
 | 
					 | 
				
			||||||
                <executions>
 | 
					 | 
				
			||||||
                    <execution>
 | 
					 | 
				
			||||||
                        <phase>package</phase>
 | 
					 | 
				
			||||||
                        <goals>
 | 
					 | 
				
			||||||
                            <goal>copy-dependencies</goal>
 | 
					 | 
				
			||||||
                        </goals>
 | 
					 | 
				
			||||||
                        <configuration>
 | 
					 | 
				
			||||||
                            <outputDirectory>${project.build.directory}</outputDirectory>
 | 
					 | 
				
			||||||
                        </configuration>
 | 
					 | 
				
			||||||
                    </execution>
 | 
					 | 
				
			||||||
                </executions>
 | 
					 | 
				
			||||||
            </plugin>
 | 
					 | 
				
			||||||
            <plugin>
 | 
					 | 
				
			||||||
                <groupId>org.codehaus.mojo</groupId>
 | 
					 | 
				
			||||||
                <artifactId>exec-maven-plugin</artifactId>
 | 
					 | 
				
			||||||
                <version>1.2.1</version>
 | 
					 | 
				
			||||||
                <executions>
 | 
					 | 
				
			||||||
                    <execution>
 | 
					 | 
				
			||||||
                        <id>bundle-install</id>
 | 
					 | 
				
			||||||
                        <phase>pre-integration-test</phase>
 | 
					 | 
				
			||||||
                        <goals>
 | 
					 | 
				
			||||||
                            <goal>exec</goal>
 | 
					 | 
				
			||||||
                        </goals>
 | 
					 | 
				
			||||||
                        <configuration>
 | 
					 | 
				
			||||||
                            <executable>composer</executable>
 | 
					 | 
				
			||||||
                            <arguments>
 | 
					 | 
				
			||||||
                                <argument>install</argument>
 | 
					 | 
				
			||||||
                            </arguments>
 | 
					 | 
				
			||||||
                        </configuration>
 | 
					 | 
				
			||||||
                    </execution>
 | 
					 | 
				
			||||||
                    <execution>
 | 
					 | 
				
			||||||
                        <id>bundle-test</id>
 | 
					 | 
				
			||||||
                        <phase>integration-test</phase>
 | 
					 | 
				
			||||||
                        <goals>
 | 
					 | 
				
			||||||
                            <goal>exec</goal>
 | 
					 | 
				
			||||||
                        </goals>
 | 
					 | 
				
			||||||
                        <configuration>
 | 
					 | 
				
			||||||
                            <executable>vendor/bin/phpunit</executable>
 | 
					 | 
				
			||||||
                        </configuration>
 | 
					 | 
				
			||||||
                    </execution>
 | 
					 | 
				
			||||||
                </executions>
 | 
					 | 
				
			||||||
            </plugin>
 | 
					 | 
				
			||||||
        </plugins>
 | 
					 | 
				
			||||||
    </build>
 | 
					 | 
				
			||||||
</project>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
@ -45,4 +45,3 @@ autoload.php
 | 
				
			|||||||
composer.json
 | 
					composer.json
 | 
				
			||||||
git_push.sh
 | 
					git_push.sh
 | 
				
			||||||
phpunit.xml.dist
 | 
					phpunit.xml.dist
 | 
				
			||||||
pom.xml
 | 
					 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user