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

PHP-CS fixer pass

Browse Source
This commit is contained in:
Franck Allimant
2014-07-01 01:07:56 +02:00
parent f820a09a1a
commit 811e89f740
20 changed files with 48 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/lib/Thelia/Core/Event/Brand/BrandUpdateEvent.php
View File

@@ -115,12 +115,13 @@ class BrandUpdateEvent extends BrandCreateEvent
}
/**
* @param int $logo_image_id
* @param int $logo_image_id
* @return $this
*/
public function setLogoImageId($logo_image_id)
{
$this->logo_image_id = $logo_image_id;
return $this;
}

6
core/lib/Thelia/Core/Event/Document/DocumentCreateOrUpdateEvent.php
View File

@@ -32,8 +32,8 @@ class DocumentCreateOrUpdateEvent extends FileCreateOrUpdateEvent
* Constructor
*
* @param string $documentType Document type
* ex : FileManager::TYPE_CATEGORY
* @param int $parentId Document parent id
* ex : FileManager::TYPE_CATEGORY
* @param int $parentId Document parent id
* @deprecated deprecated since version 2.0.3. Use FileCreateOrUpdateEvent instead
*/
public function __construct($documentType, $parentId)
@@ -128,4 +128,4 @@ class DocumentCreateOrUpdateEvent extends FileCreateOrUpdateEvent
{
return parent::getOldModel();
}
}
}

8
core/lib/Thelia/Core/Event/Document/DocumentDeleteEvent.php
View File

@@ -12,7 +12,7 @@
namespace Thelia\Core\Event\Document;
use Thelia\Core\Event\Image\FileDeleteEvent;
use Thelia\Core\Event\File\FileDeleteEvent;
use Thelia\Model\CategoryDocument;
use Thelia\Model\ContentDocument;
use Thelia\Model\FolderDocument;
@@ -35,8 +35,8 @@ class DocumentDeleteEvent extends FileDeleteEvent
* Constructor
*
* @param CategoryDocument|ProductDocument|ContentDocument|FolderDocument $documentToDelete Document about to be deleted
* @param string $documentType Document type
* ex : FileManager::TYPE_CATEGORY
* @param string $documentType Document type
* ex : FileManager::TYPE_CATEGORY
* @deprecated deprecated since version 2.0.3. Use FileDeleteEvent instead
*/
public function __construct($documentToDelete, $documentType)
@@ -94,4 +94,4 @@ class DocumentDeleteEvent extends FileDeleteEvent
return parent::getFileToDelete();
}
}
}

2
core/lib/Thelia/Core/Event/File/FileDeleteEvent.php
View File

@@ -10,7 +10,7 @@
/* file that was distributed with this source code. */
/*************************************************************************************/
namespace Thelia\Core\Event\Image;
namespace Thelia\Core\Event\File;
use Thelia\Core\Event\ActionEvent;
use Thelia\Files\FileModelInterface;

2
core/lib/Thelia/Core/Event/Image/ImageDeleteEvent.php
View File

@@ -93,4 +93,4 @@ class ImageDeleteEvent extends FileDeleteEvent
return parent::getFileToDelete();
}
}
}

6
core/lib/Thelia/Core/Event/Image/ImageEvent.php
View File

@@ -217,19 +217,21 @@ class ImageEvent extends CachedFileEvent
}
/**
* @param ImageInterface $imageObject
* @param ImageInterface $imageObject
* @return $this
*/
public function setImageObject($imageObject)
{
$this->imageObject = $imageObject;
return $this;
}
/**
* @return ImageInterface
*/
public function getImageObject() {
public function getImageObject()
{
return $this->imageObject;
}
}

4
core/lib/Thelia/Core/Event/Product/ProductUpdateEvent.php
View File

@@ -21,7 +21,6 @@ class ProductUpdateEvent extends ProductCreateEvent
protected $postscriptum;
protected $brand_id;
public function __construct($product_id)
{
$this->product_id = $product_id;
@@ -76,12 +75,13 @@ class ProductUpdateEvent extends ProductCreateEvent
}
/**
* @param int $brand_id
* @param int $brand_id
* @return $this
*/
public function setBrandId($brand_id)
{
$this->brand_id = $brand_id;
return $this;
}

2
core/lib/Thelia/Core/Template/Element/BaseLoop.php
View File

@@ -536,4 +536,4 @@ abstract class BaseLoop
*/
abstract protected function getArgDefinitions();
}
}

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

@@ -15,7 +15,6 @@ namespace Thelia\Core\Template\Loop;
use Propel\Runtime\ActiveQuery\Criteria;
use Thelia\Condition\ConditionFactory;
use Thelia\Condition\Implementation\ConditionInterface;
use Thelia\Core\HttpFoundation\Request;
use Thelia\Core\Template\Element\BaseI18nLoop;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Element\LoopResultRow;

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

@@ -23,7 +23,6 @@ use Propel\Runtime\ActiveQuery\Criteria;
use Thelia\Model\ConfigQuery;
use Thelia\Core\Template\Element\LoopResultRow;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Type\EnumType;
use Thelia\Log\Tlog;
/**

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

@@ -998,7 +998,7 @@ class Product extends BaseI18nLoop implements PropelSearchLoopInterface, SearchL
/**
* @param $loopResultRow
* @param \Thelia\Model\Product $product
* @param \Thelia\Model\Product $product
* @param $default_category_id
* @return mixed
*/

10
core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
View File

@@ -110,8 +110,8 @@ class SmartyParser extends Smarty implements ParserInterface
*
* The trim level is defined by the configuration variable html_output_trim_level
*
* @param string $source the HTML source
* @param \Smarty_Internal_Template $template
* @param string $source the HTML source
* @param \Smarty_Internal_Template $template
* @return string
*/
public function trimWhitespaces($source, \Smarty_Internal_Template $template)
@@ -136,8 +136,7 @@ class SmartyParser extends Smarty implements ParserInterface
'#(([a-z0-9]\s*=\s*(["\'])[^\3]*?\3)|<[a-z0-9_]+)\s+([a-z/>])#is' => '\1 \4',
'/(^[\n]*|[\n]+)[\s\t]*[\n]+/' => "\n"
);
}
else if ($compressionMode >= 2) {
} elseif ($compressionMode >= 2) {
if (preg_match_all('#<!--\[[^\]]+\]>.*?<!\[[^\]]+\]-->#is', $source, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
foreach ($matches as $match) {
$store[] = $match[0][0];
@@ -166,8 +165,7 @@ class SmartyParser extends Smarty implements ParserInterface
'#>\s+$#Ss' => '>',
);
}
else {
} else {
$expressions = array();
}