From 55273d2065bea421f0962447aade30d843266bf0 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Thu, 13 Mar 2014 14:52:44 +0100
Subject: [PATCH 1/3] Fixed CS

---
 DependencyInjection/Configuration.php               | 2 +-
 DependencyInjection/FOSAdvancedEncoderExtension.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 6607829..d3c9500 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -44,7 +44,7 @@ public function getConfigTreeBuilder()
                         ->performNoDeepMerging()
                         ->beforeNormalization()
                             ->ifString()
-                            ->then(function($v) { return array('algorithm' => $v); })
+                            ->then(function ($v) { return array('algorithm' => $v); })
                         ->end()
                         ->children()
                             ->scalarNode('algorithm')->cannotBeEmpty()->end()
diff --git a/DependencyInjection/FOSAdvancedEncoderExtension.php b/DependencyInjection/FOSAdvancedEncoderExtension.php
index a5e5492..4e2e7d2 100644
--- a/DependencyInjection/FOSAdvancedEncoderExtension.php
+++ b/DependencyInjection/FOSAdvancedEncoderExtension.php
@@ -77,7 +77,7 @@ private function createEncoder($config)
                 'arguments' => $arguments,
             );
         }
-        
+
         // message digest encoder
         $arguments = array(
             $config['algorithm'],

From 1977ebcde3ca02102215848436eaeb45ed35c26e Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Thu, 13 Mar 2014 15:04:13 +0100
Subject: [PATCH 2/3] Added a branch alias for master

---
 composer.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/composer.json b/composer.json
index 2bbc0ca..21d8a74 100644
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,11 @@
         "symfony/framework-bundle": "~2.1",
         "symfony/security-bundle": "~2.1"
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.1.x-dev"
+        }
+    },
     "autoload": {
         "psr-0": { "FOS\\AdvancedEncoderBundle": "" }
     },

From 99d598199de6ed53cd6c3a32d11fa5ce1ae6c987 Mon Sep 17 00:00:00 2001
From: Christophe Coevoet <stof@notk.org>
Date: Fri, 14 Mar 2014 14:08:48 +0100
Subject: [PATCH 3/3] Changed the autoloading to PSR-4

---
 composer.json | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 21d8a74..2024024 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,6 @@
         }
     },
     "autoload": {
-        "psr-0": { "FOS\\AdvancedEncoderBundle": "" }
-    },
-    "target-dir": "FOS/AdvancedEncoderBundle"
+        "psr-4": { "FOS\\AdvancedEncoderBundle\\": "" }
+    }
 }