diff --git a/README.md b/README.md index f4bb5d75fff..24bf57f796f 100644 --- a/README.md +++ b/README.md @@ -1001,6 +1001,7 @@ Here is a list of template creators: * PHP Slim: @jfastnacht * PHP Slim4: [@ybelenko](https://github.com/ybelenko) * PHP Symfony: @ksm2 + * PHP Symfony6: @BenjaminHae * Python FastAPI: @krjakbrjak * Python AIOHTTP: * Ruby on Rails 5: @zlx diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java index 6c423de454c..6b998abf06c 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpSymfonyServerCodegen.java @@ -356,7 +356,6 @@ public class PhpSymfonyServerCodegen extends AbstractPhpCodegen implements Codeg // Testing components 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/ControllerTest.mustache", toSrcPath(controllerTestsPackage, srcBasePath), "ControllerTest.php")); 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 { if (defaultIncludes.contains(op.returnType)) { op.vendorExtensions.put("x-return-type", "array|" + op.returnType); - } - else { + } else { op.vendorExtensions.put("x-return-type", "array|\\" + op.returnType); } } diff --git a/modules/openapi-generator/src/main/resources/php-symfony/testing/pom.xml b/modules/openapi-generator/src/main/resources/php-symfony/testing/pom.xml deleted file mode 100644 index 672956a1b51..00000000000 --- a/modules/openapi-generator/src/main/resources/php-symfony/testing/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - 4.0.0 - com.penneo - PhpSymfonyPetstoreServerTests - pom - 1.0-SNAPSHOT - PHP Symfony Petstore Server - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory} - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - - - bundle-install - pre-integration-test - - exec - - - composer - - install - - - - - bundle-test - integration-test - - exec - - - vendor/bin/phpunit - - - - - - - - diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/FILES b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/FILES index 4130cde47f9..6c8bb72be2c 100644 --- a/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/FILES +++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.openapi-generator/FILES @@ -45,4 +45,3 @@ autoload.php composer.json git_push.sh phpunit.xml.dist -pom.xml