Merge pull request #5 from Rarst/silex-v2

Updated for Silex v2
CHH · Nov 21, 2016 · d8d2a92 · d8d2a92
2 parents 6ad4ffb + 4174bce
commit d8d2a92
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": ">=5.3.3",
-        "silex/silex": "~1.0",
+        "silex/silex": "^2.0",
         "doctrine/cache": "~1.0"
     },
     "minimum-stability": "dev",

diff --git a/lib/CHH/Silex/CacheServiceProvider.php b/lib/CHH/Silex/CacheServiceProvider.php
@@ -2,14 +2,14 @@
 
 namespace CHH\Silex;
 
-use Silex\Application;
-use Silex\ServiceProviderInterface;
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
 use Doctrine\Common\Cache\Cache;
 use CHH\Silex\CacheServiceProvider\CacheNamespace;
 
 class CacheServiceProvider implements ServiceProviderInterface
 {
-    function register(Application $app)
+    function register(Container $app)
     {
         $app['cache.factory'] = $app->protect(function($options) {
             return function() use ($options) {
@@ -89,23 +89,19 @@ function register(Application $app)
             };
         });
 
-        $app['cache'] = $app->share(function($app) {
+        $app['cache'] = function($app) {
             $factory = $app['cache.factory']($app['cache.options']['default']);
             return $factory();
-        });
+        };
 
-        $app['caches'] = $app->share(function($app) {
-            $caches = new \Pimple;
+        $app['caches'] = function($app) {
+            $caches = new Container;
 
             foreach ($app['cache.options'] as $cache => $options) {
-                $caches[$cache] = $app->share($app['cache.factory']($options));
+                $caches[$cache] = $app['cache.factory']($options);
             }
 
             return $caches;
-        });
-    }
-
-    function boot(Application $app)
-    {
+        };
     }
 }