fixed bytes convertion method, again

Author: jfsimon

Extension/Validator/Util/ServerParams.php

@@ -29,11 +29,11 @@ public function getPostMaxSize()
             return null;
         }
 
-        if (preg_match('#^\+?(0X?)?([^KMG]*)([KMG]?)#', $iniMax, $match)) {
+        if (preg_match('#^\+?(0X?)?(.*?)([KMG]?)$#', $iniMax, $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 intval($match[2], $bases[$match[1]]) << $shifts[$match[3]];
         }
 
         return 0;

Tests/Extension/Validator/Util/ServerParamsTest.php

@@ -30,13 +30,17 @@ public function getGetPostMaxSizeTestData()
         return array(
             array('2k', 2048),
             array('2 k', 2048),
+            array('8m', 8 * 1024 * 1024),
             array('+2 k', 2048),
             array('+2???k', 2048),
             array('0x10', 16),
             array('0xf', 15),
             array('010', 8),
             array('+0x10 k', 16 * 1024),
             array('1g', 1024 * 1024 * 1024),
+            array('-1', -1),
+            array('0', 0),
+            array('2mk', 2048), // the unit must be the last char, so in this case 'k', not 'm'
         );
     }
 }