Merge pull request #10 from SpacePossum/master_service_name_var

Service name as var.

Author: SpacePossum

README.md

@@ -77,6 +77,23 @@ $logger = $app['memcache']->getLogger();
 
 // returns '$myPSR3Logger'
 $logger->getLogger();
+```
+## Custom name registering / multiple services
+
+You can register the service using a name other than the default name `memcache`.
+The same method can be used to register multiple services on your application.
+Pass the name at the constructor of the service and use the same name as prefix for the configuration.
+For example:
+
+```php
+
+$app->register(new MemcachedServiceProvider('memcached'), array('memcached.prefix' => $prefix));
+$app->register(new MemcachedServiceProvider('cache2'), array('cache2.prefix' => $prefix));
+
+// usage
+$app['memcached']->get('foo');
+$app['cache2']->get('bar');
+
 ```
 
 ### License

composer.json

@@ -10,7 +10,7 @@
     "silex/silex": "~1.1"
   },
   "require-dev": {
-    "gecko-packages/gecko-memcache-mock" : "1.0"
+    "gecko-packages/gecko-memcache-mock" : "^2.0"
   },
   "autoload": {
     "psr-4": {

src/Caching/MemcachedServiceProvider.php

@@ -27,6 +27,19 @@
  */
 final class MemcachedServiceProvider implements ServiceProviderInterface
 {
+    /**
+     * @var string
+     */
+    private $name;
+
+    /**
+     * @param string $name
+     */
+    public function __construct($name = 'memcache')
+    {
+        $this->name = $name;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -40,9 +53,10 @@ public function boot(Application $app)
      */
     public function register(Application $app)
     {
-        $app['memcache'] = $app->share(
-            function () use ($app) {
-                $memcache = isset($app['memcache.client']) ? $app['memcache.client'] : 'memcached';
+        $name = $this->name;
+        $app[$name] = $app->share(
+            function (Application $app) use ($name) {
+                $memcache = isset($app[$name.'.client']) ? $app[$name.'.client'] : 'memcached';
                 switch ($memcache) {
                     case 'memcached':
                         if (!class_exists('Memcached')) {
@@ -73,8 +87,8 @@ function () use ($app) {
                         break;
                 }
 
-                if (isset($app['memcache.servers'])) {
-                    foreach ($app['memcache.servers'] as $server) {
+                if (isset($app[$name.'.servers'])) {
+                    foreach ($app[$name.'.servers'] as $server) {
                         if (count($server) === 1) {
                             $server[1] = 11211; // use default port
                         }
@@ -85,8 +99,8 @@ function () use ($app) {
                     $memcache->addServer('127.0.0.1', 11211);
                 }
 
-                if (isset($app['memcache.prefix'])) {
-                    $memcache->setPrefix($app['memcache.prefix']);
+                if (isset($app[$name.'.prefix']) && method_exists($memcache, 'setPrefix')) {
+                    $memcache->setPrefix($app[$name.'.prefix']);
                 }
 
                 return $memcache;

tests/Caching/Tests/MemcachedServiceProviderTest.php

@@ -164,6 +164,37 @@ public function testExceptionMissingCustomClient()
         $app['memcache']->getServerList();
     }
 
+    public function testServiceName()
+    {
+        $app = new Application();
+
+        $name1 = 'memcached';
+        $prefix1 = 'prefix1';
+        $service1 = new MemcachedServiceProvider($name1);
+        $app->register($service1, array($name1.'.client' => 'mock', $name1.'.prefix' => $prefix1));
+
+        $name2 = 'cache';
+        $prefix2 = 'prefix2';
+        $service2 = new MemcachedServiceProvider($name2);
+        $app->register($service2, array($name2.'.client' => 'mock', $name2.'.prefix' => $prefix2));
+
+        $this->assertFalse(isset($app['memcache']));
+
+        $this->assertTrue(isset($app[$name1]));
+        $this->assertInstanceOf('GeckoPackages\MemcacheMock\MemcachedMock', $app[$name1]);
+
+        $this->assertTrue(isset($app[$name2]));
+        $this->assertInstanceOf('GeckoPackages\MemcacheMock\MemcachedMock', $app[$name2]);
+
+        $app[$name1]->set('foo', 'bar');
+
+        $this->assertSame('bar', $app[$name1]->get('foo'));
+        $this->assertFalse($app[$name2]->get('foo'));
+
+        $this->assertSame($prefix1, $app[$name1]->getPrefix());
+        $this->assertSame($prefix2, $app[$name2]->getPrefix());
+    }
+
     private function runCacheTest(Application $app, $prefix)
     {
         $prefixReadBack = $app['memcache']->getOption(\Memcached::OPT_PREFIX_KEY);