Improve bytes conversion method #7456
Merged
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
|
@jfsimon, you probably mis-read my comment, the code needs to be reverted. |
|
@vicb What's wrong with this solution? I need to understand. |
I don't think anybody will ever use a form to upload TB of data, but anyway "t" is not supported (I think the sames goes for "b") |
|
Okay. What about octal/hexadecimal values? Don't they need to be supported? |
|
Good point. You should ask @fabpot. |
| if (preg_match('#^\s*\+?\s*([0x]*)([1-9][0-9]*)\s*([bkmgt]?)#i', $iniMax, $match)) { | ||
| $shift = array('' => 0, 'b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40); | ||
| $bases = array('' => 10, '0' => 8, '0x' => 16); | ||
| $iniMax = (base_convert($match[2], $bases[$match[1]], 10) * (1 << $shift[strtolower($match[3])])); |
There was a problem hiding this comment.
strtoloweris not needed as the value is already normalized here (upercase)
There was a problem hiding this comment.
ìntval might be better than base_convert
There was a problem hiding this comment.
I didnt knew intval, seems better indeed.
|
Is it ready to be merged? |
|
@fabpot Yes. |
fabpot
added a commit
that referenced
this pull request
Mar 25, 2013
This PR was merged into the master branch. Discussion ---------- Improve bytes conversion method This PR improves bytes conversion `regex` method introduced in #7413 (thanks to @vicb's comments). * Adds support of `+` prefix. * Adds support of blank chars between `+`, number and unit. * Adds support of octal/hexa bases. Notice that this can not be unit tested for `ServerParams` and `UploadedFile` classes because `ini_set()` function does not work with `post_max_size` and `upload_max_filesize` settings. For information, this convertion is located in 3 classes: * `Symfony\Component\Form\Extension\Validator\Util\ServerParams` * `Symfony\Component\HttpFoundation\File\UploadedFile` * `Symfony\Component\HttpKernel\DataCollector\MemoryDataCollector` | Q | A | ------------- | --- | Bug fix? | yes | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7413 Commits ------- 21291ca improved bytes conversion method
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.
This PR improves bytes conversion
regexmethod introduced in #7413 (thanks to @vicb's comments).+prefix.+, number and unit.Notice that this can not be unit tested for
ServerParamsandUploadedFileclasses becauseini_set()function does not work withpost_max_sizeandupload_max_filesizesettings.For information, this convertion is located in 3 classes:
Symfony\Component\Form\Extension\Validator\Util\ServerParamsSymfony\Component\HttpFoundation\File\UploadedFileSymfony\Component\HttpKernel\DataCollector\MemoryDataCollector