Merge pull request #12 from codete/sf27-check

Change Form component version detection

Author: malarzm

FieldTypeMapper.php

@@ -2,13 +2,13 @@
 
 namespace Codete\FormGeneratorBundle;
 
-use Symfony\Component\HttpKernel\Kernel;
-
 class FieldTypeMapper
 {
-    protected static $typeNS = array(
+    private static $typeFQCN = null;
+
+    private static $typeNS = array(
         'Symfony\\Component\\Form\\Extension\\Core\\Type',
-        'Symfony\\Bridge\\Doctrine\\Form\\Type'
+        'Symfony\\Bridge\\Doctrine\\Form\\Type',
     );
 
     /**
@@ -17,16 +17,18 @@ class FieldTypeMapper
      */
     public static function map($type)
     {
-        $sfVersion = intval(Kernel::VERSION);
+        if (self::$typeFQCN === null) {
+            self::$typeFQCN = method_exists('\Symfony\Component\Form\AbstractType', 'getBlockPrefix');
+        }
 
-        if (is_null($type) || $sfVersion < 3) {
+        if (! self::$typeFQCN || $type === null) {
             return $type;
         }
 
         $formattedType = ucfirst($type);
         foreach (self::$typeNS as $nameSpace) {
-            if (class_exists($nameSpace.'\\'.$formattedType.'Type')) {
-                return $nameSpace.'\\'.$formattedType.'Type';
+            if (class_exists($nameSpace . '\\' . $formattedType . 'Type')) {
+                return $nameSpace . '\\' . $formattedType . 'Type';
             }
         }
 

Tests/FieldTypeMapperTest.php

@@ -17,9 +17,7 @@ public function testMap($actual, $expected)
 
     public function dataProvider()
     {
-        $sfVersion = \Symfony\Component\HttpKernel\Kernel::MAJOR_VERSION;
-
-        if ($sfVersion < 3) {
+        if (! method_exists('\Symfony\Component\Form\AbstractType', 'getBlockPrefix')) {
             return array(
                 array('choice', 'choice'),
                 array('text', 'text'),