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

fix cs

Browse Source
This commit is contained in:
Manuel Raynaud
2013-10-18 09:28:17 +02:00
parent 12b5a81364
commit 52ed89f1aa
70 changed files with 136 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Thelia/Core/Event/Area/AreaAddCountryEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area;
/**
* Class AreaAddCountryEvent
* @package Thelia\Core\Event\Area
@@ -34,7 +33,7 @@ class AreaAddCountryEvent extends AreaEvent
protected $area_id;
protected $country_id;
function __construct($area_id, $country_id)
public function __construct($area_id, $country_id)
{
$this->area_id = $area_id;
$this->country_id = $country_id;
@@ -80,7 +79,4 @@ class AreaAddCountryEvent extends AreaEvent
return $this->country_id;
}
}
}

4
core/lib/Thelia/Core/Event/Area/AreaCreateEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area;
/**
* Class AreaCreateEvent
* @package Thelia\Core\Event\Area
@@ -49,5 +48,4 @@ class AreaCreateEvent extends AreaEvent
return $this->name;
}
}
}

4
core/lib/Thelia/Core/Event/Area/AreaDeleteEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area;
/**
* Class AreaDeleteEvent
* @package Thelia\Core\Event\Area
@@ -61,5 +60,4 @@ class AreaDeleteEvent extends AreaEvent
return $this->area_id;
}
}
}

3
core/lib/Thelia/Core/Event/Area/AreaEvent.php
View File

@@ -24,7 +24,6 @@
namespace Thelia\Core\Event\Area;
use Thelia\Core\Event\ActionEvent;
/**
* Class AreaEvent
* @package Thelia\Core\Event\Shipping
@@ -63,4 +62,4 @@ class AreaEvent extends ActionEvent
{
return null !== $this->area;
}
}
}

3
core/lib/Thelia/Core/Event/Area/AreaRemoveCountryEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area;
/**
* Class AreaRemoveCountryEvent
* @package Thelia\Core\Event\Area
@@ -32,4 +31,4 @@ namespace Thelia\Core\Event\Area;
class AreaRemoveCountryEvent extends AreaAddCountryEvent
{
}
}

3
core/lib/Thelia/Core/Event/Area/AreaUpdateEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area;
/**
* Class AreaUpdateEvent
* @package Thelia\Core\Event\Area
@@ -32,4 +31,4 @@ namespace Thelia\Core\Event\Area;
class AreaUpdateEvent extends AreaCreateEvent
{
}
}

8
core/lib/Thelia/Core/Event/Area/AreaUpdatePostageEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Area;
/**
* Class AreaUpdatePostageEvent
* @package Thelia\Core\Event\Area
@@ -34,7 +33,7 @@ class AreaUpdatePostageEvent extends AreaEvent
protected $area_id;
protected $postage;
function __construct($area_id)
public function __construct($area_id)
{
$this->area_id = $area_id;
}
@@ -79,7 +78,4 @@ class AreaUpdatePostageEvent extends AreaEvent
return $this->postage;
}
}
}

4
core/lib/Thelia/Core/Event/Cache/CacheEvent.php
View File

@@ -25,7 +25,6 @@ namespace Thelia\Core\Event\Cache;
use Thelia\Core\Event\ActionEvent;
/**
* Class CacheEvent
* @package Thelia\Core\Event\Cache
@@ -63,5 +62,4 @@ class CacheEvent extends ActionEvent
return $this->dir;
}
}
}

5
core/lib/Thelia/Core/Event/Content/ContentAddFolderEvent.php
View File

@@ -24,7 +24,6 @@
namespace Thelia\Core\Event\Content;
use Thelia\Model\Content;
/**
* Class ContentAddFolderEvent
* @package Thelia\Core\Event\Content
@@ -61,6 +60,4 @@ class ContentAddFolderEvent extends ContentEvent
return $this->folderId;
}
}
}

3
core/lib/Thelia/Core/Event/Content/ContentRemoveFolderEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Content;
/**
* Class ContentRemoveFolderEvent
* @package Thelia\Core\Event\Content
@@ -31,4 +30,4 @@ namespace Thelia\Core\Event\Content;
*/
class ContentRemoveFolderEvent extends ContentAddFolderEvent
{
}
}

4
core/lib/Thelia/Core/Event/Country/CountryCreateEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Country;
/**
* Class CountryCreateEvent
* @package Thelia\Core\Event\Country
@@ -150,5 +149,4 @@ class CountryCreateEvent extends CountryEvent
return $this->area;
}
}
}

5
core/lib/Thelia/Core/Event/Country/CountryDeleteEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Country;
/**
* Class CountryDeleteEvent
* @package Thelia\Core\Event\Country
@@ -36,7 +35,7 @@ class CountryDeleteEvent extends CountryEvent
*/
protected $country_id;
function __construct($country_id)
public function __construct($country_id)
{
$this->country_id = $country_id;
}
@@ -57,4 +56,4 @@ class CountryDeleteEvent extends CountryEvent
return $this->country_id;
}
}
}

6
core/lib/Thelia/Core/Event/Country/CountryEvent.php
View File

@@ -25,7 +25,6 @@ namespace Thelia\Core\Event\Country;
use Thelia\Core\Event\ActionEvent;
use Thelia\Model\Country;
/**
* Class CountryEvent
* @package Thelia\Core\Event\Country
@@ -38,7 +37,7 @@ class CountryEvent extends ActionEvent
*/
protected $country;
function __construct(Country $country = null)
public function __construct(Country $country = null)
{
$this->country = $country;
}
@@ -69,5 +68,4 @@ class CountryEvent extends ActionEvent
return null !== $this->country;
}
}
}

5
core/lib/Thelia/Core/Event/Country/CountryToggleDefaultEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Country;
/**
* Class CountryToggleDefaultEvent
* @package Thelia\Core\Event\Country
@@ -33,7 +32,7 @@ class CountryToggleDefaultEvent extends CountryEvent
{
protected $country_id;
function __construct($country_id)
public function __construct($country_id)
{
$this->country_id = $country_id;
}
@@ -45,4 +44,4 @@ class CountryToggleDefaultEvent extends CountryEvent
{
return $this->country_id;
}
}
}

8
core/lib/Thelia/Core/Event/Country/CountryUpdateEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Country;
/**
* Class CountryUpdateEvent
* @package Thelia\Core\Event\Country
@@ -37,7 +36,7 @@ class CountryUpdateEvent extends CountryCreateEvent
protected $description;
protected $postscriptum;
function __construct($country_id)
public function __construct($country_id)
{
$this->country_id = $country_id;
}
@@ -114,7 +113,4 @@ class CountryUpdateEvent extends CountryCreateEvent
return $this->country_id;
}
}
}

8
core/lib/Thelia/Core/Event/Module/ModuleEvent.php
View File

@@ -25,7 +25,6 @@ namespace Thelia\Core\Event\Module;
use Thelia\Core\Event\ActionEvent;
use Thelia\Model\Module;
/**
* Class ModuleEvent
* @package Thelia\Core\Event\Module
@@ -38,7 +37,7 @@ class ModuleEvent extends ActionEvent
*/
protected $module;
function __construct(Module $module = null)
public function __construct(Module $module = null)
{
$this->module = $module;
}
@@ -63,7 +62,4 @@ class ModuleEvent extends ActionEvent
return $this->module;
}
}
}

8
core/lib/Thelia/Core/Event/Module/ModuleToggleActivationEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Module;
/**
* Class ModuleToggleActivationEvent
* @package Thelia\Core\Event\Module
@@ -36,7 +35,7 @@ class ModuleToggleActivationEvent extends ModuleEvent
*/
protected $module_id;
function __construct($module_id)
public function __construct($module_id)
{
$this->module_id = $module_id;
}
@@ -61,7 +60,4 @@ class ModuleToggleActivationEvent extends ModuleEvent
return $this->module_id;
}
}
}

16
core/lib/Thelia/Core/Event/PdfEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event;
/**
* Class PdfEvent
* @package Thelia\Core\Event
@@ -44,12 +43,12 @@ class PdfEvent extends ActionEvent
/**
* @param $content html content to transform into pdf
* @param string $orientation page orientation, same as TCPDF
* @param string $format The format used for pages, same as TCPDF
* @param string $lang Lang : fr, en, it...
* @param bool $unicode TRUE means that the input text is unicode (default = true)
* @param string $encoding charset encoding; default is UTF-8
* @param array $marges Default marges (left, top, right, bottom)
* @param string $orientation page orientation, same as TCPDF
* @param string $format The format used for pages, same as TCPDF
* @param string $lang Lang : fr, en, it...
* @param bool $unicode TRUE means that the input text is unicode (default = true)
* @param string $encoding charset encoding; default is UTF-8
* @param array $marges Default marges (left, top, right, bottom)
*/
public function __construct($content, $orientation = 'P', $format = 'A4', $lang='fr', $unicode=true, $encoding='UTF-8',array $marges = array(0, 0, 0, 0))
{
@@ -189,5 +188,4 @@ class PdfEvent extends ActionEvent
return $this->unicode;
}
}
}

1
core/lib/Thelia/Core/Event/Product/ProductCreateEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Product;
class ProductCreateEvent extends ProductEvent
{
protected $ref;

1
core/lib/Thelia/Core/Event/Product/ProductDeleteEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\Product;
class ProductDeleteEvent extends ProductEvent
{
public function __construct($product_id)

8
core/lib/Thelia/Core/Event/ShippingZone/ShippingZoneAddAreaEvent.php
View File

@@ -24,7 +24,6 @@
namespace Thelia\Core\Event\ShippingZone;
use Thelia\Core\Event\ActionEvent;
/**
* Class ShippingZoneAddAreaEvent
* @package Thelia\Core\Event\ShippingZone
@@ -35,7 +34,7 @@ class ShippingZoneAddAreaEvent extends ActionEvent
protected $area_id;
protected $shopping_zone_id;
function __construct($area_id, $shopping_zone_id)
public function __construct($area_id, $shopping_zone_id)
{
$this->area_id = $area_id;
$this->shopping_zone_id = $shopping_zone_id;
@@ -81,7 +80,4 @@ class ShippingZoneAddAreaEvent extends ActionEvent
return $this->shopping_zone_id;
}
}
}

3
core/lib/Thelia/Core/Event/ShippingZone/ShippingZoneRemoveAreaEvent.php
View File

@@ -23,7 +23,6 @@
namespace Thelia\Core\Event\ShippingZone;
/**
* Class ShippingZoneRemoveAreaEvent
* @package Thelia\Core\Event\ShippingZone
@@ -32,4 +31,4 @@ namespace Thelia\Core\Event\ShippingZone;
class ShippingZoneRemoveAreaEvent extends ShippingZoneAddAreaEvent
{
}
}

1
core/lib/Thelia/Core/Event/Tax/TaxRuleEvent.php
View File

@@ -118,5 +118,4 @@ class TaxRuleEvent extends ActionEvent
return $this->taxList;
}
}

3
core/lib/Thelia/Core/Event/TheliaEvents.php
View File

@@ -183,7 +183,6 @@ final class TheliaEvents
const FOLDER_TOGGLE_VISIBILITY = "action.toggleFolderVisibility";
const FOLDER_UPDATE_POSITION = "action.updateFolderPosition";
const BEFORE_CREATEFOLDER = "action.before_createFolder";
const AFTER_CREATEFOLDER = "action.after_createFolder";
@@ -204,7 +203,6 @@ final class TheliaEvents
const CONTENT_ADD_FOLDER = "action.contentAddFolder";
const CONTENT_REMOVE_FOLDER = "action.contentRemoveFolder";
const BEFORE_CREATECONTENT = "action.before_createContent";
const AFTER_CREATECONTENT = "action.after_createContent";
@@ -222,7 +220,6 @@ final class TheliaEvents
const COUNTRY_TOGGLE_DEFAULT = "action.toggleCountryDefault";
//const COUNTRY_UPDATE_POSITION = "action.updateFolderPosition";
const BEFORE_CREATECOUNTRY = "action.before_createCountry";
const AFTER_CREATECOUNTRY = "action.after_createCountry";

7
core/lib/Thelia/Core/Template/Loop/Area.php
View File

@@ -30,7 +30,6 @@ use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Model\AreaQuery;
/**
* Class Area
* @package Thelia\Core\Template\Loop
@@ -112,8 +111,7 @@ class Area extends BaseLoop
$withoutZone = $this->getWithout_zone();
if($withoutZone)
{
if ($withoutZone) {
$search->joinAreaDeliveryModule('without_zone', Criteria::LEFT_JOIN)
->addJoinCondition('without_zone', 'delivery_module_id '.Criteria::EQUAL.' ?', $withoutZone, null, \PDO::PARAM_INT)
->where('`without_zone`.delivery_module_id '.Criteria::ISNULL);
@@ -140,5 +138,4 @@ class Area extends BaseLoop
return $loopResult;
}
}
}

2
core/lib/Thelia/Core/Template/Loop/Folder.php
View File

@@ -114,7 +114,7 @@ class Folder extends BaseI18nLoop
if (null !== $content) {
$obj = ContentQuery::create()->findPk($content);
if($obj) {
if ($obj) {
$search->filterByContent($obj, Criteria::IN);
}
}

4
core/lib/Thelia/Core/Template/Loop/FolderPath.php
View File

@@ -30,7 +30,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Model\FolderQuery;
use Thelia\Type\BooleanOrBothType;
/**
* Class FolderPath
* @package Thelia\Core\Template\Loop
@@ -156,5 +155,4 @@ class FolderPath extends BaseI18nLoop
return $loopResult;
}
}
}

6
core/lib/Thelia/Core/Template/Loop/Tax.php
View File

@@ -97,7 +97,7 @@ class Tax extends BaseI18nLoop
$country = $this->getCountry();
$taxRule = $this->getTax_rule();
if(null !== $taxRule && null !== $country) {
if (null !== $taxRule && null !== $country) {
$search->filterByTaxRuleCountry(
TaxRuleCountryQuery::create()
->filterByCountryId($country, Criteria::EQUAL)
@@ -108,7 +108,7 @@ class Tax extends BaseI18nLoop
}
$excludeTaxRule = $this->getExclude_tax_rule();
if(null !== $excludeTaxRule && null !== $country) {
if (null !== $excludeTaxRule && null !== $country) {
$excludedTaxes = TaxRuleCountryQuery::create()
->filterByCountryId($country, Criteria::EQUAL)
->filterByTaxRuleId($excludeTaxRule, Criteria::IN)
@@ -118,7 +118,7 @@ class Tax extends BaseI18nLoop
$excludedTaxes,
Criteria::NOT_IN
);*/
foreach($excludedTaxes as $excludedTax) {
foreach ($excludedTaxes as $excludedTax) {
$search->filterByTaxRuleCountry($excludedTax, Criteria::NOT_EQUAL);
}
}

16
core/lib/Thelia/Core/Template/Loop/TaxRuleCountry.php
View File

@@ -35,8 +35,6 @@ use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Map\CountryTableMap;
use Thelia\Model\Map\TaxRuleCountryTableMap;
use Thelia\Model\Map\TaxTableMap;
use Thelia\Type\TypeCollection;
use Thelia\Type;
use Thelia\Model\TaxRuleCountryQuery;
/**
@@ -76,15 +74,15 @@ class TaxRuleCountry extends BaseI18nLoop
$country = $this->getCountry();
$taxes = $this->getTaxes();
if((null === $country && null === $taxes)) {
if ((null === $country && null === $taxes)) {
throw new \InvalidArgumentException('You must provide either `country` or `taxes` parameter in tax-rule-country loop');
}
if((null === $country && null !== $taxes)) {
if ((null === $country && null !== $taxes)) {
throw new \InvalidArgumentException('You must provide `country` parameter with `taxes` parameter in tax-rule-country loop');
}
if(null !== $taxes) {
if (null !== $taxes) {
$search->groupByCountryId();
$originalCountryJoin = new Join();
@@ -106,7 +104,7 @@ class TaxRuleCountry extends BaseI18nLoop
CountryTableMap::TABLE_NAME,
'COUNTRY_ID'
);
} elseif(null !== $country) {
} elseif (null !== $country) {
$search->filterByCountryId($country);
/* manage tax translation */
@@ -132,7 +130,7 @@ class TaxRuleCountry extends BaseI18nLoop
$loopResultRow = new LoopResultRow($loopResult, $taxRuleCountry, $this->versionable, $this->timestampable, $this->countable);
if(null !== $taxes) {
if (null !== $taxes) {
$loopResultRow
->set("TAX_RULE" , $taxRuleCountry->getTaxRuleId())
->set("COUNTRY" , $taxRuleCountry->getCountryId())
@@ -141,7 +139,7 @@ class TaxRuleCountry extends BaseI18nLoop
->set("COUNTRY_DESCRIPTION" , $taxRuleCountry->getVirtualColumn(CountryTableMap::TABLE_NAME . '_i18n_DESCRIPTION'))
->set("COUNTRY_POSTSCRIPTUM" , $taxRuleCountry->getVirtualColumn(CountryTableMap::TABLE_NAME . '_i18n_POSTSCRIPTUM'))
;
}elseif(null !== $country) {
} elseif (null !== $country) {
$loopResultRow
->set("TAX_RULE" , $taxRuleCountry->getTaxRuleId())
->set("COUNTRY" , $taxRuleCountry->getCountryId())
@@ -152,8 +150,6 @@ class TaxRuleCountry extends BaseI18nLoop
;
}
$loopResult->addRow($loopResultRow);
}

1
core/lib/Thelia/Core/Template/Loop/Template.php
View File

@@ -32,7 +32,6 @@ use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
use Thelia\Core\Template\Loop\Argument\Argument;
use Thelia\Model\Base\TemplateQuery;
use Thelia\Type;
/**
*

3
core/lib/Thelia/Core/Template/Smarty/Plugins/DataAccessFunctions.php
View File

@@ -172,6 +172,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
self::$dataAccessCache['defaultCountry'] = $defaultCountry;
}*/
$defaultCountry = CountryQuery::create()->filterByByDefault(1)->limit(1);
return $this->dataAccessWithI18n("defaultCountry", $params, $defaultCountry);
}
}
@@ -237,7 +238,7 @@ class DataAccessFunctions extends AbstractSmartyPlugin
public function ConfigDataAccess($params, $smarty)
{
if(false === array_key_exists("key", $params)) {
if (false === array_key_exists("key", $params)) {
return null;
}

6
core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
View File

@@ -152,7 +152,7 @@ class Form extends AbstractSmartyPlugin
$template->assign("options", $formFieldView->vars);
/* access to choices */
if(isset($formFieldView->vars['choices'])) {
if (isset($formFieldView->vars['choices'])) {
$template->assign("choices", $formFieldView->vars['choices']);
}
@@ -199,8 +199,8 @@ $this->assignFieldValues($template, $formFieldView->vars["full_name"], $fieldVar
foreach ($formView->getIterator() as $row) {
if ($this->isHidden($row) && $row->isRendered() === false) {
$attributeList = array();
if(isset($row->vars["attr"])) {
foreach($row->vars["attr"] as $attrKey => $attrValue) {
if (isset($row->vars["attr"])) {
foreach ($row->vars["attr"] as $attrKey => $attrValue) {
$attributeList[] = sprintf($attrFormat, $attrKey, $attrValue);
}
}