From 45bc9c9e2f8080eab372d46ed472cdd0de2b5cc5 Mon Sep 17 00:00:00 2001 From: Philzen Date: Wed, 5 Jun 2024 04:43:52 +0200 Subject: [PATCH] [php-laravel] Fix file database/migrations/2019_08_19_000000 being written twice (#18832) * Implement dedicated transitional test for #18831 bugfix * Remove duplicated database migration file from supportingFiles collection * Activate AllGeneratorsTest.noDuplicateSupportingFiles * Drop transitional test again * Simplify truthy assertions --- .../languages/PhpLaravelServerCodegen.java | 3 --- .../openapitools/codegen/AllGeneratorsTest.java | 3 +-- .../codegen/php/PhpLaravelServerCodegenTest.java | 16 ++++++---------- .../php-laravel/.openapi-generator/FILES | 1 - 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java index 8ba229df4b83..59e191e75d13 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java @@ -202,9 +202,6 @@ public class PhpLaravelServerCodegen extends AbstractPhpCodegen { supportingFiles.add(new SupportingFile("config/session.php", outputFolder + File.separator + "config", "session.php")); supportingFiles.add(new SupportingFile("config/view.php", outputFolder + File.separator + "config", "view.php")); - // /database/ - supportingFiles.add(new SupportingFile("database/migrations/2019_08_19_000000_create_failed_jobs_table.php", outputFolder + File.separator + "database" + File.separator + "migrations", "2019_08_19_000000_create_failed_jobs_table.php")); - // /resources/ supportingFiles.add(new SupportingFile("resources/js/app.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "app.js")); supportingFiles.add(new SupportingFile("resources/js/bootstrap.js", outputFolder + File.separator + "resources" + File.separator + "assets" + File.separator + "js", "bootstrap.js")); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/AllGeneratorsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/AllGeneratorsTest.java index ff6d5c301dce..18f0de296467 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/AllGeneratorsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/AllGeneratorsTest.java @@ -86,8 +86,7 @@ public class AllGeneratorsTest { ); } - @Test(dataProvider = "generators", enabled = false) // re-enable when https://github.com/OpenAPITools/openapi-generator/issues/18831 is fixed - void noDuplicateSupportingFiles(CodegenConfig codegenConfig) { + @Test(dataProvider = "generators") void noDuplicateSupportingFiles(CodegenConfig codegenConfig) { final List supportingFiles = codegenConfig.supportingFiles() .stream().map(SupportingFile::toString).collect(Collectors.toList()); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpLaravelServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpLaravelServerCodegenTest.java index c90459e87c56..359bae82cfc7 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpLaravelServerCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/php/PhpLaravelServerCodegenTest.java @@ -24,33 +24,29 @@ import org.testng.annotations.Test; public class PhpLaravelServerCodegenTest { - @Test - public void testInitialConfigValues() throws Exception { + @Test public void testInitialConfigValues() throws Exception { final PhpLaravelServerCodegen codegen = new PhpLaravelServerCodegen(); codegen.processOpts(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE); - Assert.assertEquals(codegen.isHideGenerationTimestamp(), true); + Assert.assertTrue(codegen.isHideGenerationTimestamp()); } - @Test - public void testSettersForConfigValues() throws Exception { + @Test public void testSettersForConfigValues() throws Exception { final PhpLaravelServerCodegen codegen = new PhpLaravelServerCodegen(); codegen.setHideGenerationTimestamp(false); codegen.processOpts(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); - Assert.assertEquals(codegen.isHideGenerationTimestamp(), false); + Assert.assertFalse(codegen.isHideGenerationTimestamp()); } - @Test - public void testAdditionalPropertiesPutForConfigValues() throws Exception { + @Test public void testAdditionalPropertiesPutForConfigValues() throws Exception { final PhpLaravelServerCodegen codegen = new PhpLaravelServerCodegen(); codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, false); codegen.processOpts(); Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE); - Assert.assertEquals(codegen.isHideGenerationTimestamp(), false); + Assert.assertFalse(codegen.isHideGenerationTimestamp()); } - } diff --git a/samples/server/petstore/php-laravel/.openapi-generator/FILES b/samples/server/petstore/php-laravel/.openapi-generator/FILES index 25d212023fdd..f749ee75ce2e 100644 --- a/samples/server/petstore/php-laravel/.openapi-generator/FILES +++ b/samples/server/petstore/php-laravel/.openapi-generator/FILES @@ -100,7 +100,6 @@ lib/database/.gitignore lib/database/factories/UserFactory.php lib/database/migrations/2014_10_12_000000_create_users_table.php lib/database/migrations/2019_08_19_000000_create_failed_jobs_table.php -lib/database/migrations/2019_08_19_000000_create_failed_jobs_table.php lib/database/seeds/DatabaseSeeder.php lib/package.json lib/phpunit.xml