Merge pull request #174 from greg0ire/fix_caching_issue

Implement configuration outside the pass

DependencyInjection/JMSPaymentCoreExtension.php

@@ -3,13 +3,15 @@
 namespace JMS\Payment\CoreBundle\DependencyInjection;
 
 use JMS\Payment\CoreBundle\DependencyInjection\Configuration;
-use Symfony\Component\Config\FileLocator;
+use JMS\Payment\CoreBundle\Entity\ExtendedDataType;
 use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
-use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\Kernel;
 
 /*
  * Copyright 2010 Johannes M. Schmitt <[email protected]>
@@ -27,8 +29,19 @@
  * limitations under the License.
  */
 
-class JMSPaymentCoreExtension extends Extension
+class JMSPaymentCoreExtension extends Extension implements PrependExtensionInterface
 {
+    public function prepend(ContainerBuilder $container)
+    {
+        $container->prependExtensionConfig('doctrine', array(
+            'dbal' => array(
+                'types' => array(
+                    ExtendedDataType::NAME => 'JMS\Payment\CoreBundle\Entity\ExtendedDataType'
+                )
+            )
+        ));
+    }
+
     public function load(array $configs, ContainerBuilder $container)
     {
         $xmlLoader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
@@ -46,4 +59,4 @@ public function load(array $configs, ContainerBuilder $container)
             $container->removeDefinition('payment.form.choose_payment_method_type');
         }
     }
-}
+}

JMSPaymentCoreBundle.php

@@ -28,12 +28,16 @@
 
 class JMSPaymentCoreBundle extends Bundle
 {
+    public function boot()
+    {
+        ExtendedDataType::setEncryptionService($this->container->get('payment.encryption_service'));
+    }
+
     public function build(ContainerBuilder $builder)
     {
         parent::build($builder);
 
         $builder->addCompilerPass(new AddPaymentPluginsPass());
         $builder->addCompilerPass(new AddPaymentMethodFormTypesPass());
-        $builder->addCompilerPass(new RegisterExtendedDataTypePass());
     }
 }