From 8d9bb4bc00913022c99a747c6dcbf4997cd8221e Mon Sep 17 00:00:00 2001
From: Max Podbeltsev <podbeltsev@gmail.com>
Date: Thu, 16 Jun 2016 13:43:40 +0300
Subject: [PATCH 1/5] silex2 init

---
 src/Provider/LocaleServiceProvider.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Provider/LocaleServiceProvider.php b/src/Provider/LocaleServiceProvider.php
index c8ccd59..b99e20e 100644
--- a/src/Provider/LocaleServiceProvider.php
+++ b/src/Provider/LocaleServiceProvider.php
@@ -1,8 +1,8 @@
 <?php
 namespace Pmaxs\Silex\Locale\Provider;
 
-use Silex\Application;
-use Silex\ServiceProviderInterface;
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
 use Pmaxs\Silex\Locale\EventListener\LocaleListener;
 use Pmaxs\Silex\Locale\UrlGenerator as LocaleUrlGenerator;
 use Pmaxs\Silex\Locale\Twig\LocaleExtension;
@@ -15,11 +15,11 @@ class LocaleServiceProvider implements ServiceProviderInterface
     /**
      * @inheritdoc
      */
-    public function register(Application $app)
+    public function register(Container $app)
     {
         $app['locale.fake_index_route'] = 'locale-index0';
 
-        $app['locale.url_generator'] = $app->share(function() use ($app) {
+        $app['locale.url_generator'] = function() use ($app) {
             return new LocaleUrlGenerator(
                 $app['url_generator'],
                 $app['locale.locales'],
@@ -28,7 +28,7 @@ public function register(Application $app)
                 $app['locale.resolve_by_host'],
                 $app['locale.fake_index_route']
             );
-        });
+        };
 
         if (isset($app['twig'])) {
             $app->extend('twig', function ($twig) use ($app) {

From c33556886a4d08d302b61068ee00427b174792b6 Mon Sep 17 00:00:00 2001
From: Max Podbeltsev <podbeltsev@gmail.com>
Date: Thu, 16 Jun 2016 14:03:57 +0300
Subject: [PATCH 2/5] composer

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

diff --git a/composer.json b/composer.json
index 8905a04..4e2e291 100644
--- a/composer.json
+++ b/composer.json
@@ -16,5 +16,10 @@
         "psr-4": {
             "Pmaxs\\Silex\\Locale\\": "src/"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0"
+        }
     }
 }

From 5961ae9e2d380768e708a45701f782c90623f603 Mon Sep 17 00:00:00 2001
From: Max Podbeltsev <podbeltsev@gmail.com>
Date: Thu, 16 Jun 2016 14:05:45 +0300
Subject: [PATCH 3/5] revert

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

diff --git a/composer.json b/composer.json
index 4e2e291..8905a04 100644
--- a/composer.json
+++ b/composer.json
@@ -16,10 +16,5 @@
         "psr-4": {
             "Pmaxs\\Silex\\Locale\\": "src/"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.0"
-        }
     }
 }

From 72f587f37ea93f8ddca297cf5b857aef8df6174d Mon Sep 17 00:00:00 2001
From: Max Podbeltsev <podbeltsev@gmail.com>
Date: Thu, 16 Jun 2016 20:26:48 +0300
Subject: [PATCH 4/5] fixes

---
 src/Provider/LocaleServiceProvider.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Provider/LocaleServiceProvider.php b/src/Provider/LocaleServiceProvider.php
index b99e20e..8e5286e 100644
--- a/src/Provider/LocaleServiceProvider.php
+++ b/src/Provider/LocaleServiceProvider.php
@@ -3,6 +3,8 @@
 
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
+use Silex\Application;
+use Silex\Api\BootableProviderInterface;
 use Pmaxs\Silex\Locale\EventListener\LocaleListener;
 use Pmaxs\Silex\Locale\UrlGenerator as LocaleUrlGenerator;
 use Pmaxs\Silex\Locale\Twig\LocaleExtension;
@@ -10,7 +12,7 @@
 /**
  * Locale Provider.
  */
-class LocaleServiceProvider implements ServiceProviderInterface
+class LocaleServiceProvider implements ServiceProviderInterface, BootableProviderInterface
 {
     /**
      * @inheritdoc

From 0fe5dc949004146e29ec6f57e266ab75cec0203e Mon Sep 17 00:00:00 2001
From: Max Podbeltsev <podbeltsev@gmail.com>
Date: Wed, 12 Oct 2016 15:54:47 +0300
Subject: [PATCH 5/5] formatting

---
 src/Provider/LocaleServiceProvider.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Provider/LocaleServiceProvider.php b/src/Provider/LocaleServiceProvider.php
index 0a12aee..2d40a5d 100644
--- a/src/Provider/LocaleServiceProvider.php
+++ b/src/Provider/LocaleServiceProvider.php
@@ -72,7 +72,7 @@ public function boot(Application $app)
                 ))
                 ->setRequirements(array(
                     'locale0' => '|' . implode('|', $app['locale.locales']),
-            ));
-    }
+                ));
+        }
     }
 }