Merge pull request #14 from arsfeld/master

simensen · simensen · commit 24be501eee49 · 2013-08-23T11:47:48.000-07:00
Use options defined for the specific cache
diff --git a/src/Dflydev/Pimple/Provider/DoctrineOrm/DoctrineOrmServiceProvider.php b/src/Dflydev/Pimple/Provider/DoctrineOrm/DoctrineOrmServiceProvider.php
@@ -192,7 +192,7 @@ public function register(\Pimple $app)
                 return $app[$cacheInstanceKey];
             }
 
-            return $app[$cacheInstanceKey] = $app['orm.cache.factory']($driver, $options);
+            return $app[$cacheInstanceKey] = $app['orm.cache.factory']($driver, $options[$cacheNameKey]);
         });
 
         $app['orm.cache.factory.backing_memcache'] = $app->protect(function() {

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ public function register(\Pimple $app)`
`192`	`192`	`return $app[$cacheInstanceKey];`
`193`	`193`	`}`
`194`	`194`
`195`		`- return $app[$cacheInstanceKey] = $app['orm.cache.factory']($driver, $options);`
	`195`	`+ return $app[$cacheInstanceKey] = $app['orm.cache.factory']($driver, $options[$cacheNameKey]);`
`196`	`196`	`});`
`197`	`197`
`198`	`198`	`$app['orm.cache.factory.backing_memcache'] = $app->protect(function() {`