Permalink
Browse files

Merge branch '2.2'

* 2.2:
  fixed CS
  Add persian translation to Components/Security
  bumped Symfony version to 2.2.1-DEV-DEV
  updated VERSION for 2.2.0
  updated CHANGELOG for 2.2.0
  • Loading branch information...
2 parents 946d2e2 + 6647a39 commit 06dae9a103d9f03e5e4afd454fdfe6c8e22ef517 @fabpot fabpot committed Mar 1, 2013
Showing with 1 addition and 0 deletions.
  1. +1 −0 Form/PropelTypeGuesser.php
@@ -85,6 +85,7 @@ public function guessType($class, $property)
//check if this is mysql enum
$choices = $column->getValueSet();
$labels = array_map('ucfirst', $choices);
+
return new TypeGuess('choice', array('choices' => array_combine($choices, $labels)), Guess::MEDIUM_CONFIDENCE);
}
case \PropelColumnTypes::VARCHAR:

0 comments on commit 06dae9a

Please sign in to comment.