TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use of $this->getContainer() instead of $this->container

Browse Source
This commit is contained in:
Franck Allimant
2014-04-17 18:58:23 +02:00
parent e0079096dd
commit 70b7037768
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/lib/Thelia/Module/BaseModule.php
View File

@@ -30,19 +30,19 @@ use Symfony\Component\DependencyInjection\ContainerAware;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Thelia\Core\HttpFoundation\Session\Session; use Thelia\Core\HttpFoundation\Session\Session;
use Thelia\Exception\ModuleException;
use Thelia\Model\Cart; use Thelia\Model\Cart;
use Thelia\Model\Country; use Thelia\Model\Country;
use Thelia\Model\Map\ModuleTableMap;
use Thelia\Model\ModuleI18nQuery;
use Thelia\Model\Map\ModuleImageTableMap; use Thelia\Model\Map\ModuleImageTableMap;
use Thelia\Model\Map\ModuleTableMap;
use Thelia\Model\Module;
use Thelia\Model\ModuleI18n; use Thelia\Model\ModuleI18n;
use Thelia\Model\ModuleI18nQuery;
use Thelia\Model\ModuleImage;
use Thelia\Model\ModuleQuery;
use Thelia\Model\Order; use Thelia\Model\Order;
use Thelia\TaxEngine\TaxEngine; use Thelia\TaxEngine\TaxEngine;
use Thelia\Tools\Image; use Thelia\Tools\Image;
use Thelia\Exception\ModuleException;
use Thelia\Model\Module;
use Thelia\Model\ModuleImage;
use Thelia\Model\ModuleQuery;
class BaseModule extends ContainerAware implements BaseModuleInterface class BaseModule extends ContainerAware implements BaseModuleInterface
{ {
@@ -138,7 +138,7 @@ class BaseModule extends ContainerAware implements BaseModuleInterface
{ {
if ($this->hasRequest() === false) { if ($this->hasRequest() === false) {
// Try to get request from container. // Try to get request from container.
$this->setRequest($this->container->get('request')); $this->setRequest($this->getContainer()->get('request'));
} }
if ($this->hasRequest() === false) { if ($this->hasRequest() === false) {
@@ -171,7 +171,7 @@ class BaseModule extends ContainerAware implements BaseModuleInterface
* Sets a module titles for various languages * Sets a module titles for various languages
* *
* @param Module $module the module. * @param Module $module the module.
* @param $titles an associative array of locale => title_string * @param array $titles an associative array of locale => title_string
*/ */
public function setTitle(Module $module, $titles) public function setTitle(Module $module, $titles)
{ {
@@ -197,8 +197,7 @@ class BaseModule extends ContainerAware implements BaseModuleInterface
/** /**
* Ensure the proper deployment of the module's images. * Ensure the proper deployment of the module's images.
* *
* TODO : clarify the purpose of ModuleImage. How this table will be used elswhere in Thelia ? * TODO : this method does not take care of internationalization. This is a bug.
* TODO : this method doesn't take care of internationalization. This is a bug.
* *
* @param Module $module the module * @param Module $module the module
* @param string $folderPath the image folder path * @param string $folderPath the image folder path
@@ -223,6 +222,7 @@ class BaseModule extends ContainerAware implements BaseModuleInterface
/* browse the directory */ /* browse the directory */
$imagePosition = 1; $imagePosition = 1;
/** @var \DirectoryIterator $directoryContent */
foreach ($directoryBrowser as $directoryContent) { foreach ($directoryBrowser as $directoryContent) {
/* is it a file ? */ /* is it a file ? */
if ($directoryContent->isFile()) { if ($directoryContent->isFile()) {
@@ -347,7 +347,7 @@ class BaseModule extends ContainerAware implements BaseModuleInterface
$order = $session->getOrder(); $order = $session->getOrder();
/** @var TaxEngine $taxEngine */ /** @var TaxEngine $taxEngine */
$taxEngine = $this->container->get("thelia.taxengine"); $taxEngine = $this->getContainer()->get("thelia.taxengine");
/** @var Country $country */ /** @var Country $country */
$country = $taxEngine->getDeliveryCountry(); $country = $taxEngine->getDeliveryCountry();
@@ -363,7 +363,7 @@ class BaseModule extends ContainerAware implements BaseModuleInterface
/** /**
* *
* This method allow adding new compilers to Thelia container * This method adds new compilers to Thelia container
* *
* You must return an array. This array can contain : * You must return an array. This array can contain :
* - arrays * - arrays
@@ -409,7 +409,7 @@ class BaseModule extends ContainerAware implements BaseModuleInterface
*/ */
public function install(ConnectionInterface $con = null) public function install(ConnectionInterface $con = null)
{ {
// Implement this method to do something useful. // Override this method to do something useful.
} }
/** /**
@@ -463,4 +463,4 @@ class BaseModule extends ContainerAware implements BaseModuleInterface
{ {
// Override this method to do something useful. // Override this method to do something useful.
} }
} }