From 31dc5238de4770366a7b05b852fa15664b5c9b5a Mon Sep 17 00:00:00 2001 From: Manuel Raynaud Date: Mon, 3 Feb 2014 14:07:23 +0100 Subject: [PATCH] change container interface, using good one --- core/lib/Thelia/Action/Module.php | 4 ++-- core/lib/Thelia/Install/CheckPermission.php | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/core/lib/Thelia/Action/Module.php b/core/lib/Thelia/Action/Module.php index 049edcbb0..01a54b1ab 100644 --- a/core/lib/Thelia/Action/Module.php +++ b/core/lib/Thelia/Action/Module.php @@ -23,7 +23,7 @@ namespace Thelia\Action; use Propel\Runtime\Propel; -use Propel\Runtime\ServiceContainer\ServiceContainerInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Filesystem\Filesystem; @@ -53,7 +53,7 @@ class Module extends BaseAction implements EventSubscriberInterface */ protected $container; - public function __construct(ServiceContainerInterface $container) + public function __construct(ContainerInterface $container) { $this->container = $container; } diff --git a/core/lib/Thelia/Install/CheckPermission.php b/core/lib/Thelia/Install/CheckPermission.php index a9059bf73..4ace03c8b 100644 --- a/core/lib/Thelia/Install/CheckPermission.php +++ b/core/lib/Thelia/Install/CheckPermission.php @@ -399,13 +399,10 @@ class CheckPermission extends BaseInstall // The 'G' modifier is available since PHP 5.1.0 case 'g': $val *= 1024; - break; case 'm': $val *= 1024; - break; case 'k': $val *= 1024; - break; } return $val;