[Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible #22586
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aaa2000
commented
Apr 30, 2017
| @@ -119,6 +119,18 @@ public function reverseTransform($value) | |||
| } | |||
|
|
|||
| $formatter = $this->getNumberFormatter(); | |||
| $groupSep = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL); | |||
There was a problem hiding this comment.
I duplicate code of NumberToLocalizedStringTransformer.php maybe it is better to use it directly ?
- if (!is_string($value)) {
- throw new TransformationFailedException('Expected a string.');
- }
-
if ('' === $value) {
return;
}
$formatter = $this->getNumberFormatter();
- $groupSep = $formatter->getSymbol(\NumberFormatter::GROUPING_SEPARATOR_SYMBOL);
- $decSep = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL);
$grouping = $formatter->getAttribute(\NumberFormatter::GROUPING_USED);
-
- if ('.' !== $decSep && (!$grouping || '.' !== $groupSep)) {
- $value = str_replace('.', $decSep, $value);
- }
-
- if (',' !== $decSep && (!$grouping || ',' !== $groupSep)) {
- $value = str_replace(',', $decSep, $value);
- }
-
- // replace normal spaces so that the formatter can read them
- $value = $formatter->parse(str_replace(' ', ' ', $value));
-
- if (intl_is_failure($formatter->getErrorCode())) {
- throw new TransformationFailedException($formatter->getErrorMessage());
- }
+ $transformer = new NumberToLocalizedStringTransformer($this->scale, (bool) $grouping);
+ $value = $transformer->reverseTransform($value);
99d6f37 to
dece32e
Compare
xabbuh
reviewed
May 12, 2017
| $decSep = $formatter->getSymbol(\NumberFormatter::DECIMAL_SEPARATOR_SYMBOL); | ||
| $grouping = $formatter->getAttribute(\NumberFormatter::GROUPING_USED); | ||
|
|
||
| if ('.' !== $decSep && (!$grouping || '.' !== $groupSep)) { |
There was a problem hiding this comment.
Wouldn't be easier to first remove the grouping character and then replace $decSep with a dot?
There was a problem hiding this comment.
I prefer to use the same logic as NumberToLocalizedStringTransformer but if you want, I can try
There was a problem hiding this comment.
LGTM
@xabbuh would you be +1 even if we ignore your comment?
| @@ -25,6 +25,7 @@ CHANGELOG | |||
| * "choice_value" | |||
| * "choice_attr" | |||
| * "group_by" | |||
| * added PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible | |||
There was a problem hiding this comment.
I think we don't need this change, we don't put entries there for bug fixes
|
|
||
| public function testDecimalSeparatorMayBeDotIfGroupingSeparatorIsNotDot() | ||
| { | ||
| \Locale::setDefault('fr'); |
There was a problem hiding this comment.
tests are failing because this method is not always available, can you fix it @aaa2000 ?
… and dot as decimal separator, if possible
dece32e to
a42fa98
Compare
|
Tests fixed and revert the change in changelog. |
|
@xabbuh @nicolas-grekas Any decision on this one? |
nicolas-grekas
approved these changes
Oct 1, 2017
|
Thank you @aaa2000. |
fabpot
added a commit
that referenced
this pull request
Oct 1, 2017
… both comma and dot as decimal separator, if possible (aaa2000) This PR was squashed before being merged into the 2.7 branch (closes #22586). Discussion ---------- [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible | Q | A | ------------- | --- | Branch? | 2.7 <!-- see comment below --> | Bug fix? | yes-ish | New feature? | no <!-- don't forget updating src/**/CHANGELOG.md files --> | BC breaks? | no | Deprecations? | no <!-- don't forget updating UPGRADE-*.md files --> | Tests pass? | yes | Fixed tickets | <!-- #-prefixed issue number(s), if any --> | License | MIT <!-- - Bug fixes must be submitted against the lowest branch where they apply (lowest branches are regularly merged to upper ones so they get the fixes too). - Features and deprecations must be submitted against the master branch. - Please fill in this template according to the PR you're about to submit. - Replace this comment by a description of what your PR is solving. --> Implements the same behaviour that `NumberToLocalizedStringTransformer` in order to accept both comma and dot implemented in #5941 Commits ------- f96a7f8 [Form] Fixed PercentToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
This was referenced Oct 5, 2017
Merged
Merged
Merged
This was referenced Oct 6, 2017
fabpot
added a commit
that referenced
this pull request
Oct 10, 2017
This PR was merged into the 2.7 branch. Discussion ---------- [Form] fix parsing invalid floating point numbers | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #19854, #22586 | License | MIT | Doc PR | Should make AppVeyor builds pass again. Code borrowed from `NumberToLocalizedStringTransformer`. Commits ------- 042eac4 [Form] fix parsing invalid floating point numbers
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implements the same behaviour that
NumberToLocalizedStringTransformerin order to accept both comma and dot implemented in #5941