Issue #5288 fix #6109
Merged
Issue #5288 fix #6109
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
| $multi = $multi/10; | ||
| } | ||
|
|
||
| return (int) $intVersion; |
There was a problem hiding this comment.
Why did you change this method?
There was a problem hiding this comment.
After installing symfony during the hack day the test was failing on my machine and an other person on Ubuntu 12.10. So I guessed that it was fixed in a later version of the ICU.
So I made the function more detailed so that also the number behind the second dot of the version is taken into account.
It now is correct on my local machine but it fails on Travis. So I need to figure out where the change is in the ICU lib to find the correct version number to switch from BR to R.
fabpot
added a commit
that referenced
this pull request
Dec 12, 2012
This PR was merged into the master branch. Commits ------- 12a890f Issue 5288 fix Discussion ---------- Issue #5288 fix I only have the test failing on php -v 5.4.6-1ubuntu1 ICU version 4.8.1.1 Test results 1) Symfony\Component\Locale\Tests\Stub\StubLocaleTest::testGetCurrenciesData Failed asserting that two strings are equal. --- Expected +++ Actual @@ @@ -'BR$' +'R$' It looks like the check $this->isSameAsIcuVersion('4.8') on line is to strict. It was added here 90d6dc37 but I don't how to test the fix on icu version 4.8.0.x Bug fix: yes Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: #5288 Todo: Check older version of the ICU lib are still working. Because I could not test that.
| $multi = 1000; | ||
| $intVersion = 0; | ||
| foreach ($versionIds as $id) { | ||
| $intVersion += $id * $multi; |
There was a problem hiding this comment.
Some spaces are missing. Can be fixed with php-cs-fixer.
fabpot
added a commit
that referenced
this pull request
Jan 5, 2013
This PR was merged into the master branch. Commits ------- 97bc257 [Locale] Rolled back normalizeIcuVersion() method in unit tests. Discussion ---------- [Locale] Rolled back normalizeIcuVersion() method in unit tests. We just need to check if version is 4.4 or 4.8 and we do not need to know if it is 4.8.0 or 4.8.1.1 (at least for now there are no big differences between minor ICU versions). This change basically rolls back modifications made in #6109 to fix #5288. Those modifications didn't really fix the issue since ICU>=4.9 wasn't handled properly. Part of the roll back was made in #6515 (2.1 branch). This change makes master branch consistent with what we have in 2.0 and 2.1 (bespoke tests are passing in those branches). Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: one test fails in the Propel1 bridge Fixes the following tickets: #5517 Todo: - License of the code: MIT Documentation PR: -
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.
I only have the test failing on
php -v
5.4.6-1ubuntu1
ICU version 4.8.1.1
Test results
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'BR$'
+'R$'
It looks like the check $this->isSameAsIcuVersion('4.8') on line is to strict.
It was added here 90d6dc37 but I don't how to test the fix on icu version 4.8.0.x
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5288
Todo: Check older version of the ICU lib are still working. Because I could not test that.