Using protected $container instead of (missing) getContainer() method

This commit is contained in:
Franck Allimant
2014-02-03 15:31:34 +01:00
parent 84f8a15fac
commit aa993b0cf9

View File

@@ -49,7 +49,7 @@ use Thelia\Module\BaseModule;
class Module extends BaseAction implements EventSubscriberInterface
{
/**
* @var \Propel\Runtime\ServiceContainer\ServiceContainerInterface
* @var ContainerInterface
*/
protected $container;
@@ -66,7 +66,7 @@ class Module extends BaseAction implements EventSubscriberInterface
$moduleInstance = $moduleClass->newInstance();
if ( method_exists($moduleInstance, 'setContainer')) {
$moduleInstance->setContainer($this->getContainer());
$moduleInstance->setContainer($this->container);
if ($module->getActivate() == BaseModule::IS_ACTIVATED) {
$moduleInstance->deActivate($module);
} else {
@@ -99,7 +99,7 @@ class Module extends BaseAction implements EventSubscriberInterface
$reflected = new \ReflectionClass($module->getFullNamespace());
$instance = $reflected->newInstance();
$instance->setContainer($this->getContainer());
$instance->setContainer($this->container);
$path = dirname($reflected->getFileName());
@@ -193,7 +193,7 @@ class Module extends BaseAction implements EventSubscriberInterface
{
$cacheEvent = new CacheEvent(
$dispatcher,
$this->getContainer()->getParameter('kernel.cache_dir')
$this->container->getParameter('kernel.cache_dir')
);
$dispatcher->dispatch(TheliaEvents::CACHE_CLEAR, $cacheEvent);