merged smottt/FOSAdvancedEncoderBundle for adding bcrypt

Conflicts:
	DependencyInjection/Configuration.php
	DependencyInjection/FOSAdvancedEncoderExtension.php
	Tests/DependencyInjection/FOSAdvancedEncoderExtensionTest.php

Author: Marc Feininger

DependencyInjection/Configuration.php

@@ -51,6 +51,7 @@ public function getConfigTreeBuilder()
                             ->booleanNode('ignore_case')->defaultFalse()->end()
                             ->booleanNode('encode_as_base64')->defaultTrue()->end()
                             ->scalarNode('iterations')->defaultValue(5000)->end()
+                            ->scalarNode('cost')->defaultValue(13)->end()
                             ->scalarNode('hash_algorithm')->defaultValue('sha512')->end()
                             ->scalarNode('key_length')->defaultValue(40)->end()
                             ->scalarNode('id')->end()

DependencyInjection/FOSAdvancedEncoderExtension.php

@@ -53,6 +53,16 @@ private function createEncoder($config)
             );
         }
 
+        // bcrypt encoder
+        if ('bcrypt' === $config['algorithm']) {
+            $arguments = array($config['cost']);
+
+            return array(
+                'class' => new Parameter('security.encoder.bcrypt.class'),
+                'arguments' => $arguments,
+            );
+        }
+
         // pbkdf2 encoder
         if ('pbkdf2' === $config['algorithm']) {
             $arguments = array(
@@ -64,10 +74,10 @@ private function createEncoder($config)
 
             return array(
                 'class'     => new Parameter('security.encoder.pbkdf2.class'),
-                'arguments' => $arguments
+                'arguments' => $arguments,
             );
         }
-
+        
         // message digest encoder
         $arguments = array(
             $config['algorithm'],

Tests/DependencyInjection/FOSAdvancedEncoderExtensionTest.php

@@ -43,13 +43,17 @@ public function testLoadFullConfiguration()
                 'custom' => array(
                     'id' => 'acme_demo.encoder',
                 ),
+                'bcrypt' => array(
+                    'algorithm' => 'bcrypt',
+                    'cost'      => 16,
+                ),
                 'pbkdf2' => array(
                     'algorithm' => 'pbkdf2',
                     'hash_algorithm' => 'sha512',
                     'encode_as_base64' => false,
                     'iterations' => 2,
                     'key_length' => 40,
-                )
+                ),
             ),
         );
         $loader->load(array($config), $container);
@@ -72,10 +76,14 @@ public function testLoadFullConfiguration()
                         'arguments' => array(false),
                     ),
                     'custom' => new Reference('acme_demo.encoder'),
+                    'bcrypt' => array(
+                        'class' => new Parameter('security.encoder.bcrypt.class'),
+                        'arguments' => array(16),
+                    ),
                     'pbkdf2' => array(
                         'class' => new Parameter('security.encoder.pbkdf2.class'),
                         'arguments' => array('sha512', false, 2, 40),
-                    )
+                    ),
                 )
             )
         );