bug #30 Fix Symfony 3 support (sstok)

This PR was merged into the master branch. Discussion ---------- |Q |A | |--- |---| |Bug Fix? |yes| |New Feature? |no | |BC Breaks? |no | |Deprecations?|no | |Fixed Tickets| | |License |MIT| Commits ------- 63e2e9a Fix Symfony 3 support
rollerworks · Jan 1, 2016 · bc03566 · bc03566
2 parents 98ff4df + 63e2e9a
commit bc03566
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/src/Extension/Type/FieldTypeExtension.php b/src/Extension/Type/FieldTypeExtension.php
@@ -12,6 +12,7 @@
 namespace Rollerworks\Component\Search\Extension\Doctrine\Dbal\Type;
 
 use Rollerworks\Component\Search\AbstractFieldTypeExtension;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -30,17 +31,30 @@ public function configureOptions(OptionsResolver $resolver)
             ['doctrine_dbal_conversion' => null]
         );
 
-        $resolver->setAllowedTypes(
-            [
-                'doctrine_dbal_conversion' => [
+        if ($resolver instanceof Options) {
+            $resolver->setAllowedTypes(
+                'doctrine_dbal_conversion',
+                [
                     'null',
                     'Closure',
                     'Rollerworks\Component\Search\Doctrine\Dbal\SqlFieldConversionInterface',
                     'Rollerworks\Component\Search\Doctrine\Dbal\SqlValueConversionInterface',
                     'Rollerworks\Component\Search\Doctrine\Dbal\ValueConversionInterface',
-                ],
-            ]
-        );
+                ]
+            );
+        } else {
+            $resolver->setAllowedTypes(
+                [
+                    'doctrine_dbal_conversion' => [
+                        'null',
+                        'Closure',
+                        'Rollerworks\Component\Search\Doctrine\Dbal\SqlFieldConversionInterface',
+                        'Rollerworks\Component\Search\Doctrine\Dbal\SqlValueConversionInterface',
+                        'Rollerworks\Component\Search\Doctrine\Dbal\ValueConversionInterface',
+                    ],
+                ]
+            );
+        }
     }
 
     /**

diff --git a/src/Extension/Type/MoneyTypeExtension.php b/src/Extension/Type/MoneyTypeExtension.php
@@ -13,6 +13,7 @@
 
 use Rollerworks\Component\Search\AbstractFieldTypeExtension;
 use Rollerworks\Component\Search\Extension\Doctrine\Dbal\Conversion\MoneyValueConversion;
+use Symfony\Component\OptionsResolver\Options;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -51,9 +52,13 @@ public function configureOptions(OptionsResolver $resolver)
             ]
         );
 
-        $resolver->setAllowedTypes(
-            ['doctrine_dbal_with_currency' => ['bool']]
-        );
+        if ($resolver instanceof Options) {
+            $resolver->setAllowedTypes('doctrine_dbal_with_currency', ['bool']);
+        } else {
+            $resolver->setAllowedTypes(
+                ['doctrine_dbal_with_currency' => ['bool']]
+            );
+        }
     }
 
     /**