Skip to content

[php-laravel] Fix file database/migrations/2019_08_19_000000 being written twice #18832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Philzen merged 5 commits into from
Jun 5, 2024
Merged

[php-laravel] Fix file database/migrations/2019_08_19_000000 being written twice #18832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
889ab1c
Implement dedicated transitional test for #18831 bugfix
Philzen Jun 2, 2024
c7877dd
Remove duplicated database migration file from supportingFiles collec…
Philzen Jun 4, 2024
77e1892
Activate AllGeneratorsTest.noDuplicateSupportingFiles
Philzen Jun 4, 2024
71c57a9
Drop transitional test again
Philzen Jun 4, 2024
082fc47
Simplify truthy assertions
Philzen Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ...i-generator/src/main/java/org/openapitools/codegen/languages/PhpLaravelServerCodegen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,6 @@ public PhpLaravelServerCodegen() {
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"));
Expand Down
3 changes: 1 addition & 2 deletions modules/openapi-generator/src/test/java/org/openapitools/codegen/AllGeneratorsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ public void testEachWithPetstore(CodegenConfig codegenConfig) {
);
}

@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<String> supportingFiles = codegenConfig.supportingFiles()
.stream().map(SupportingFile::toString).collect(Collectors.toList());

Expand Down
16 changes: 6 additions & 10 deletions ...api-generator/src/test/java/org/openapitools/codegen/php/PhpLaravelServerCodegenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,33 +24,29 @@

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());
}

}
1 change: 0 additions & 1 deletion samples/server/petstore/php-laravel/.openapi-generator/FILES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down