Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merged branch jfsimon/issue-7413 (PR #7456)

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
  • Loading branch information...
commit 9ab67ab183fb1cfbb6d924c59ba383dcaf3fef45 2 parents 8c57a61 + 88ca917
@fabpot fabpot authored
Showing with 7 additions and 5 deletions.
  1. +7 −5 File/UploadedFile.php
View
12 File/UploadedFile.php
@@ -231,17 +231,19 @@ public function move($directory, $name = null)
*/
public static function getMaxFilesize()
{
- $max = trim(ini_get('upload_max_filesize'));
+ $max = strtolower(ini_get('upload_max_filesize'));
if ('' === $max) {
return PHP_INT_MAX;
}
- if (preg_match('#^(\d+)([bkmgt])#i', $max, $match)) {
- $shift = array('b' => 0, 'k' => 10, 'm' => 20, 'g' => 30, 't' => 40);
- $max = ($match[1] * (1 << $shift[strtolower($match[2])]));
+ if (preg_match('#^\+?(0x?)?([^kmg]*)([kmg]?)#', $max, $match)) {
+ $shifts = array('' => 0, 'k' => 10, 'm' => 20, 'g' => 30);
+ $bases = array('' => 10, '0' => 8, '0x' => 16);
+
+ return (intval($match[2], $bases[$match[1]]) * (1 << $shifts[$match[3]]));
}
- return (integer) $max;
+ return 0;
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.