Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add default value on default local#11150

Merged
lchrusciel merged 5 commits into
Sylius:1.7from
macintoshplus:fix/issue_11149
Jul 21, 2020
Merged

Add default value on default local#11150
lchrusciel merged 5 commits into
Sylius:1.7from
macintoshplus:fix/issue_11149

Conversation

@macintoshplus
Copy link
Copy Markdown
Contributor

@macintoshplus macintoshplus commented Feb 26, 2020

Add default value if no translation exist on default local

Q A
Branch? 1.6
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Related tickets fixes #11149
License MIT

@macintoshplus macintoshplus requested a review from a team as a code owner February 26, 2020 12:56
@Zales0123 Zales0123 added the Potential Bug Potential bugs or bugfixes, that needs to be reproduced. label Feb 27, 2020
lchrusciel
lchrusciel approved these changes Mar 3, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@lchrusciel lchrusciel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello Jean-Baptiste,

thanks a lot for your contribution! Do you think you can test this behaviour somehow?

@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented Mar 3, 2020

Hello @lchrusciel,

I have tested on my Sylius project before send this PR. I dont know how you want test a Symfony FormType : Behat, PHPSpec, PHP Unit ?

@lchrusciel
Copy link
Copy Markdown
Contributor

lchrusciel commented Mar 3, 2020

We already have a few form type tests, like this one: https://github.com/Sylius/Sylius/blob/master/src/Sylius/Bundle/AddressingBundle/Tests/Form/Type/ZoneChoiceTypeTest.php

Could you try to reproduce and perhaps cover this issue, so we will not have a regression in the future?

@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented Mar 3, 2020 •
edited
Loading

@lchrusciel I have added the test.

lchrusciel
lchrusciel reviewed Mar 4, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@lchrusciel lchrusciel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would need to ask you to rebase this PR to the newest changes on branch 1.6

Comment thread config/bundles.php Outdated
@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented Mar 4, 2020

I would need to ask you to rebase this PR to the newest changes on branch 1.6

I have rebase on branch 1.6

@lchrusciel
Copy link
Copy Markdown
Contributor

lchrusciel commented Mar 5, 2020

It's something wrong with the branch. We need to wait for #11179 to merge this PR

@lchrusciel
Copy link
Copy Markdown
Contributor

lchrusciel commented Mar 6, 2020

Can you rebase again? Build should be green now

@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented Mar 20, 2020

@lchrusciel Sorry, after many rebase, the tests does not pass

@probot-autolabeler probot-autolabeler Bot added Documentation Documentation related issues and PRs - requests, fixes, proposals. Maintenance CI configurations, READMEs, releases, etc. labels May 31, 2020
@macintoshplus macintoshplus changed the base branch from 1.6 to 1.7 May 31, 2020 21:28
@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented May 31, 2020

Hi @lchrusciel,

I have rebase to Sylius 1.7. But tests fail. Why ?

@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented May 31, 2020 •
edited
Loading

Related #11149

lchrusciel
lchrusciel reviewed Jun 2, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@lchrusciel lchrusciel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems you spotted another window with the broken build (see #11542).

Comment thread src/Sylius/Bundle/AttributeBundle/Form/Type/AttributeType/SelectAttributeType.php Outdated
lchrusciel
lchrusciel approved these changes Jun 5, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@lchrusciel lchrusciel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would say, that it is good to go. I've left a few CS-related comments, however the main problem there is placing of methods, according to Symfony Coding Standards

Comment thread src/Sylius/Bundle/AttributeBundle/Tests/Form/Type/AttributeType/SelectAttributeTypeTest.php Outdated
Comment thread src/Sylius/Bundle/AttributeBundle/Tests/Form/Type/AttributeType/SelectAttributeTypeTest.php Outdated
Comment thread src/Sylius/Bundle/AttributeBundle/Tests/Form/Type/AttributeType/SelectAttributeTypeTest.php Outdated
Comment thread src/Sylius/Bundle/AttributeBundle/Tests/Form/Type/AttributeType/SelectAttributeTypeTest.php Outdated
Comment thread src/Sylius/Bundle/AttributeBundle/Tests/Form/Type/AttributeType/SelectAttributeTypeTest.php Outdated
Comment thread src/Sylius/Bundle/AttributeBundle/Tests/Form/Type/AttributeType/SelectAttributeTypeTest.php Outdated
@lchrusciel
Copy link
Copy Markdown
Contributor

lchrusciel commented Jun 10, 2020

Hey Jean-Baptiste 👋

could you rebase your PR to the newest master? The build should be green then.

@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented Jun 10, 2020

Hey Jean-Baptiste

could you rebase your PR to the newest master? The build should be green then.

I need rebase to merge in 1.7 branch or master ? Actually the origin branch is 1.7 to merge into 1.7 branch.

@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented Jun 10, 2020

ping @lchrusciel

@lchrusciel
Copy link
Copy Markdown
Contributor

lchrusciel commented Jun 16, 2020

My mistake, of course, it should be rebased to 1.7.

@lchrusciel lchrusciel changed the base branch from 1.7 to master July 13, 2020 18:33
@lchrusciel lchrusciel changed the base branch from master to 1.7 July 13, 2020 18:35
@lchrusciel
Copy link
Copy Markdown
Contributor

lchrusciel commented Jul 13, 2020

The base of this pull-request was changed, you need fetch and reset your local branch
if you want to add new commits to this pull request. Reset before you pull, else commits
may become messed-up.

Unless you added new commits (to this branch) locally that you did not push yet,
execute git fetch origin && git reset "fix/issue_11149" to update your local branch.

Feel free to ask for assistance when you get stuck 👍

@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented Jul 15, 2020

@lchrusciel I have rebase my branch... The test error is not caused by this PR changes. How to relaunch to attempt to pass the test ?

@lchrusciel
Copy link
Copy Markdown
Contributor

lchrusciel commented Jul 16, 2020

Tests at the bottom are rerun and passes. The problem is with static analysis: https://travis-ci.org/github/Sylius/Sylius/jobs/707744459#L2451

@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented Jul 17, 2020

I have fix the Psalm error (locally checked). I'm horrified by the need to add specific comment in code to pass static analysis.

@macintoshplus
Copy link
Copy Markdown
Contributor Author

macintoshplus commented Jul 21, 2020

Enjoy! All check is done and no conflict! My PR can be merged @lchrusciel!

lchrusciel
lchrusciel approved these changes Jul 21, 2020
View reviewed changes
Copy link
Copy Markdown
Contributor

@lchrusciel lchrusciel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! Thanks a lot for your contribution, Jean-Baptiste!

It took us some time, but finally, I'm able to welcome you among Sylius contributor :)

@lchrusciel lchrusciel merged commit 0896246 into Sylius:1.7 Jul 21, 2020
@lchrusciel
Copy link
Copy Markdown
Contributor

lchrusciel commented Jul 21, 2020

Thanks, Jean-Baptiste! 🎉

@lchrusciel lchrusciel mentioned this pull request Jul 21, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@lchrusciel lchrusciel lchrusciel approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Documentation Documentation related issues and PRs - requests, fixes, proposals. Maintenance CI configurations, READMEs, releases, etc. Potential Bug Potential bugs or bugfixes, that needs to be reproduced.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Unable to use a select attribute with a value without a label

3 participants

@macintoshplus @lchrusciel @Zales0123