Skip to content
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.

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

[Form] Fixed wrong usages of the "text" type #16677

Merged
merged 1 commit into from Nov 26, 2015
Merged

Conversation

webmozart
Copy link
Contributor

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets -
License MIT
Doc PR -

@stloyd
Copy link
Contributor

stloyd commented Nov 26, 2015

This can't be done in 2.8 as it would require PHP 5.5.

@webmozart
Copy link
Contributor Author

Ah yes, this was originally based on master. Will fix.

@webmozart
Copy link
Contributor Author

Fixed now.

@@ -11,12 +11,12 @@

namespace Symfony\Component\Form;

use Symfony\Component\Form\Exception\RuntimeException;
Copy link
Member

Choose a reason for hiding this comment

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

please don't do use-reordering changes in 2.8 as it can cause conflicts when merging later

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, this was done automatically by PhpStorm. Will revert this.

I think we should always keep all use statements ordered in all branches. This makes merging much easier in general. StyleCI, for example, does that automatically.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah but then we should start with it in 2.3.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👍

@nicolas-grekas
Copy link
Member

👍

@fabpot
Copy link
Member

fabpot commented Nov 26, 2015

Thank you @webmozart.

@fabpot fabpot merged commit 9149622 into symfony:2.8 Nov 26, 2015
fabpot added a commit that referenced this pull request Nov 26, 2015
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fixed wrong usages of the "text" type

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

9149622 [Form] Fixed wrong usages of the "text" type
This was referenced Nov 30, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants