Remove mcrypt services

DependencyInjection/Configuration.php

@@ -62,12 +62,6 @@ public function getConfigTreeBuilder()
                 ->then(function ($config) {
                     @trigger_error($this->getSecretDeprecationMessage(), E_USER_DEPRECATED);
 
-                    $config['encryption'] = array(
-                        'enabled'  => true,
-                        'provider' => 'mcrypt',
-                        'secret'   => $config['secret'],
-                    );
-
                     return $config;
                 })
             ->end()

DependencyInjection/JMSPaymentCoreExtension.php

@@ -58,14 +58,10 @@ public function load(array $configs, ContainerBuilder $container)
         if ($config['encryption']['enabled']) {
             $container->setParameter('payment.encryption', $config['encryption']['provider']);
             $container->setParameter('payment.encryption.secret', $config['encryption']['secret']);
-
-            foreach (array('mcrypt', 'defuse_php_encryption') as $provider) {
-                $container->setParameter("payment.encryption.$provider.secret", $config['encryption']['secret']);
-            }
+            $container->setParameter("payment.encryption.defuse_php_encryption.secret", $config['encryption']['secret']);
         } else {
             $container->removeAlias('payment.encryption_service');
             $container->removeDefinition('payment.encryption');
-            $container->removeDefinition('payment.encryption.mcrypt');
             $container->removeDefinition('payment.encryption.defuse_php_encryption');
         }
     }

JMSPaymentCoreBundle.php

@@ -5,7 +5,6 @@
 use JMS\Payment\CoreBundle\DependencyInjection\Compiler\AddPaymentMethodFormTypesPass;
 use JMS\Payment\CoreBundle\DependencyInjection\Compiler\AddPaymentPluginsPass;
 use JMS\Payment\CoreBundle\DependencyInjection\Compiler\ConfigureEncryptionPass;
-use JMS\Payment\CoreBundle\DependencyInjection\Compiler\LegacyEncryptionPass;
 use JMS\Payment\CoreBundle\Entity\ExtendedDataType;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
@@ -41,7 +40,6 @@ public function build(ContainerBuilder $builder)
 
         $builder->addCompilerPass(new AddPaymentPluginsPass());
         $builder->addCompilerPass(new AddPaymentMethodFormTypesPass());
-        $builder->addCompilerPass(new LegacyEncryptionPass());
         $builder->addCompilerPass(new ConfigureEncryptionPass());
     }
 }

Resources/config/payment.xml

@@ -15,20 +15,8 @@
         <parameter key="payment.form.choose_payment_method_type.class">JMS\Payment\CoreBundle\Form\ChoosePaymentMethodType</parameter>
         <parameter key="payment.form.choose_payment_method_transformer.class">JMS\Payment\CoreBundle\Form\Transformer\ChoosePaymentMethodTransformer</parameter>
 
-        <parameter key="payment.encryption.mcrypt.class">JMS\Payment\CoreBundle\Cryptography\MCryptEncryptionService</parameter>
-        <parameter key="payment.encryption.mcrypt.secret"></parameter>
-        <parameter key="payment.encryption.mcrypt.cipher">rijndael-256</parameter>
-        <parameter key="payment.encryption.mcrypt.mode">ctr</parameter>
-
         <parameter key="payment.encryption.defuse_php_encryption.class">JMS\Payment\CoreBundle\Cryptography\DefusePhpEncryptionService</parameter>
         <parameter key="payment.encryption.defuse_php_encryption.secret"></parameter>
-
-        <!-- DEPRECATED since 1.3, will be removed in 2.0: use the payment.encryption.mcrypt.* parameters instead -->
-        <parameter key="payment.encryption_service.class">JMS\Payment\CoreBundle\Cryptography\MCryptEncryptionService</parameter>
-        <parameter key="payment.encryption_service.secret"></parameter>
-        <parameter key="payment.encryption_service.cipher">rijndael-256</parameter>
-        <parameter key="payment.encryption_service.mode">ctr</parameter>
-
     </parameters>
 
     <services>
@@ -50,16 +38,6 @@
             <argument type="service" id="event_dispatcher" />
         </service>
 
-        <!-- DEPRECATED since 1.3, will be removed in 2.0: use payment.encryption.mcrypt directly instead -->
-        <service id="payment.encryption_service" alias="payment.encryption.mcrypt" />
-
-        <service id="payment.encryption.mcrypt" class="%payment.encryption.mcrypt.class%">
-            <argument>%payment.encryption.mcrypt.secret%</argument>
-            <argument>%payment.encryption.mcrypt.cipher%</argument>
-            <argument>%payment.encryption.mcrypt.mode%</argument>
-            <tag name="payment.encryption" alias="mcrypt" />
-        </service>
-
         <service id="payment.encryption.defuse_php_encryption" alias="JMS\Payment\CoreBundle\Cryptography\DefusePhpEncryptionService"/>
         <service id="JMS\Payment\CoreBundle\Cryptography\DefusePhpEncryptionService" class="%payment.encryption.defuse_php_encryption.class%" public="true">
             <argument>%payment.encryption.defuse_php_encryption.secret%</argument>

Tests/DependencyInjection/Configuration/ConfigurationTest.php

@@ -21,23 +21,6 @@ public function testNoSecret()
         );
     }
 
-    public function testSecret()
-    {
-        $this->assertConfigurationIsValid(array('secret' => 'foo'));
-
-        $this->assertConfigurationEquals(
-            array('secret' => 'foo'),
-            array(
-                'secret' => 'foo',
-                'encryption' => array(
-                    'enabled' => true,
-                    'secret' => 'foo',
-                    'provider' => 'mcrypt',
-                ),
-            )
-        );
-    }
-
     public function testEncryptionDisabled()
     {
         $this->assertConfigurationIsValid(array());