Merge pull request #148 from zobzn/fix-php-71-validator-schema-get-bytes

fix notice "A non well formed numeric value encountered in ... sfValidatorSchema::getBytes" (php 7.1)

Author: j0k3r

lib/validator/sfValidatorSchema.class.php

@@ -390,18 +390,21 @@ public function __clone()
 
   protected function getBytes($value)
   {
-    $value = trim($value);
-    switch (strtolower($value[strlen($value) - 1]))
-    {
-      // The 'G' modifier is available since PHP 5.1.0
-      case 'g':
-        $value *= 1024;
-      case 'm':
-        $value *= 1024;
-      case 'k':
-        $value *= 1024;
+    $value    = trim($value);
+    $number   = (float) $value;
+    $modifier = strtolower($value[strlen($value) - 1]);
+
+    $exp_by_modifier = array(
+      'k' => 1,
+      'm' => 2,
+      'g' => 3,
+    );
+
+    if (array_key_exists($modifier, $exp_by_modifier)) {
+      $exp    = $exp_by_modifier[$modifier];
+      $number = $number * pow(1024, $exp);
     }
 
-    return $value;
+    return $number;
   }
 }

test/unit/validator/sfValidatorSchemaTest.php

@@ -10,7 +10,7 @@
 
 require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(85);
+$t = new lime_test(94);
 
 class PreValidator extends sfValidatorBase
 {
@@ -48,6 +48,14 @@ protected function doClean($values)
   }
 }
 
+class BytesValidatorSchema extends sfValidatorSchema
+{
+  public function getBytes($value)
+  {
+    return parent::getBytes($value);
+  }
+}
+
 $v1 = new sfValidatorString(array('max_length' => 3));
 $v2 = new sfValidatorString(array('min_length' => 3));
 
@@ -401,3 +409,15 @@ protected function doClean($values)
 $t->ok($v1->getPreValidator() == $v->getPreValidator(), '__clone() clones the pre validator');
 $t->ok($v1->getPostValidator() !== $v->getPostValidator(), '__clone() clones the post validator');
 $t->ok($v1->getPostValidator() == $v->getPostValidator(), '__clone() clones the post validator');
+
+$t->diag('convert post_max_size to bytes');
+$v = new BytesValidatorSchema();
+$t->is($v->getBytes(null), 0, 'empty string considered as 0 bytes');
+$t->is($v->getBytes(''), 0, 'empty string considered as 0 bytes');
+$t->is($v->getBytes('0'), 0, 'simple bytes');
+$t->is($v->getBytes('1'), 1, 'simple bytes');
+$t->is($v->getBytes('1B'), 1, 'simple bytes');
+$t->is($v->getBytes('1K'), 1024, 'kilobytes');
+$t->is($v->getBytes('1M'), 1024 * 1024, 'megabytes short syntax');
+$t->is($v->getBytes('0.5M'), 1024 * 1024 / 2, 'fractional megabytes');
+$t->is($v->getBytes('1G'), 1024 * 1024 * 1024, 'gigabytes');