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

Fix cs

Browse Source 
modifié:         core/lib/Thelia/ImportExport/AbstractHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/DocumentsExportInterface.php
	modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/ImagesExportInterface.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/MailingExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
	modifié:         core/lib/Thelia/ImportExport/Import/ImportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductPricesImport.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         core/lib/Thelia/Tests/ContainerAwareTestCase.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ExportHandlerTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductSEOExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductPricesImportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
This commit is contained in:
Benjamin Perche
2014-07-25 10:22:28 +02:00
parent f891d8b788
commit b2588a8fca
19 changed files with 29 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/Thelia/ImportExport/AbstractHandler.php
View File

@@ -30,13 +30,13 @@ abstract class AbstractHandler
* *
* Dependency injection: load the container to be able to get parameters and services * Dependency injection: load the container to be able to get parameters and services
*/ */
public function __construct(ContainerInterface $container) { public function __construct(ContainerInterface $container)
{
$this->defaultLocale = Lang::getDefaultLanguage()->getLocale(); $this->defaultLocale = Lang::getDefaultLanguage()->getLocale();
$this->container = $container; $this->container = $container;
} }
public function getContainer() public function getContainer()
{ {
return $this->container; return $this->container;

8
core/lib/Thelia/ImportExport/Export/ExportHandler.php
View File

@@ -80,7 +80,7 @@ abstract class ExportHandler extends AbstractHandler
} }
/** /**
* @param \Thelia\Model\Lang $lang * @param \Thelia\Model\Lang $lang
* @return \Thelia\Core\FileFormat\Formatting\FormatterData * @return \Thelia\Core\FileFormat\Formatting\FormatterData
* *
* The method builds the FormatterData for the formatter * The method builds the FormatterData for the formatter
@@ -92,10 +92,8 @@ abstract class ExportHandler extends AbstractHandler
$query = $this->buildDataSet($lang); $query = $this->buildDataSet($lang);
if ($query instanceof ModelCriteria) { if ($query instanceof ModelCriteria) {
return $data->loadModelCriteria($query); return $data->loadModelCriteria($query);
} elseif (is_array($query)) { } elseif (is_array($query)) {
return $data->setData($query); return $data->setData($query);
} elseif ($query instanceof BaseLoop) { } elseif ($query instanceof BaseLoop) {
$pagination = null; $pagination = null;
@@ -160,7 +158,7 @@ abstract class ExportHandler extends AbstractHandler
$return = "CONCAT("; $return = "CONCAT(";
$len = strlen($str); $len = strlen($str);
for($i = 0; $i < $len; ++$i) { for ($i = 0; $i < $len; ++$i) {
$return .= "CHAR(".ord($str[$i])."),"; $return .= "CHAR(".ord($str[$i])."),";
} }
@@ -212,7 +210,7 @@ abstract class ExportHandler extends AbstractHandler
} }
/** /**
* @param Lang $lang * @param Lang $lang
* @return ModelCriteria|array|BaseLoop * @return ModelCriteria|array|BaseLoop
*/ */
abstract public function buildDataSet(Lang $lang); abstract public function buildDataSet(Lang $lang);

1
core/lib/Thelia/ImportExport/Export/ImagesExportInterface.php
View File

@@ -11,7 +11,6 @@
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\ImportExport\Export; namespace Thelia\ImportExport\Export;
/** /**
* interface ImagesExportInterface * interface ImagesExportInterface
* @package Thelia\ImportExport * @package Thelia\ImportExport

2
core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php
View File

@@ -23,7 +23,6 @@ use Thelia\Model\Map\CountryI18nTableMap;
use Thelia\Model\Map\CountryTableMap; use Thelia\Model\Map\CountryTableMap;
use Thelia\Model\Map\CustomerTableMap; use Thelia\Model\Map\CustomerTableMap;
use Thelia\Model\Map\CustomerTitleI18nTableMap; use Thelia\Model\Map\CustomerTitleI18nTableMap;
use Thelia\Model\Map\CustomerTitleTableMap;
use Thelia\Model\Map\NewsletterTableMap; use Thelia\Model\Map\NewsletterTableMap;
use Thelia\Model\OrderQuery; use Thelia\Model\OrderQuery;
@@ -215,7 +214,6 @@ class CustomerExport extends ExportHandler
$dateTime = new \DateTime($date); $dateTime = new \DateTime($date);
$currentCustomer[CustomerTableMap::CREATED_AT] = $dateTime->format($lang->getDatetimeFormat()); $currentCustomer[CustomerTableMap::CREATED_AT] = $dateTime->format($lang->getDatetimeFormat());
/** /**
* Then compute everything about the orders * Then compute everything about the orders
*/ */

3
core/lib/Thelia/ImportExport/Export/Type/MailingExport.php
View File

@@ -11,7 +11,6 @@
/*************************************************************************************/ /*************************************************************************************/
namespace Thelia\ImportExport\Export\Type; namespace Thelia\ImportExport\Export\Type;
use Thelia\Core\FileFormat\Formatting\FormatterData;
use Thelia\Core\FileFormat\FormatType; use Thelia\Core\FileFormat\FormatType;
use Thelia\ImportExport\Export\ExportHandler; use Thelia\ImportExport\Export\ExportHandler;
use Thelia\Model\CustomerQuery; use Thelia\Model\CustomerQuery;
@@ -28,7 +27,7 @@ use Thelia\Model\NewsletterQuery;
class MailingExport extends ExportHandler class MailingExport extends ExportHandler
{ {
/** /**
* @param Lang $lang * @param Lang $lang
* @return array|\Propel\Runtime\ActiveQuery\ModelCriteria * @return array|\Propel\Runtime\ActiveQuery\ModelCriteria
*/ */
public function buildDataSet(Lang $lang) public function buildDataSet(Lang $lang)

3
core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
View File

@@ -57,7 +57,7 @@ class ProductPricesExport extends ExportHandler
} }
/** /**
* @param Lang $lang * @param Lang $lang
* @return FormatterData * @return FormatterData
*/ */
public function buildDataSet(Lang $lang) public function buildDataSet(Lang $lang)
@@ -126,5 +126,4 @@ class ProductPricesExport extends ExportHandler
]; ];
} }
} }

3
core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
View File

@@ -13,7 +13,6 @@
namespace Thelia\ImportExport\Export\Type; namespace Thelia\ImportExport\Export\Type;
use Propel\Runtime\ActiveQuery\Criteria; use Propel\Runtime\ActiveQuery\Criteria;
use Propel\Runtime\ActiveQuery\Join; use Propel\Runtime\ActiveQuery\Join;
use Thelia\Core\FileFormat\Formatting\FormatterData;
use Thelia\Core\FileFormat\FormatType; use Thelia\Core\FileFormat\FormatType;
use Thelia\ImportExport\Export\ExportHandler; use Thelia\ImportExport\Export\ExportHandler;
use Thelia\Model\Map\ProductI18nTableMap; use Thelia\Model\Map\ProductI18nTableMap;
@@ -54,7 +53,7 @@ class ProductSEOExport extends ExportHandler
} }
/** /**
* @param Lang $lang * @param Lang $lang
* @return array|\Propel\Runtime\ActiveQuery\ModelCriteria * @return array|\Propel\Runtime\ActiveQuery\ModelCriteria
*/ */
public function buildDataSet(Lang $lang) public function buildDataSet(Lang $lang)

3
core/lib/Thelia/ImportExport/Import/Type/ProductPricesImport.php
View File

@@ -112,7 +112,7 @@ class ProductPricesImport extends ImportHandler
if (isset($row["promo"])) { if (isset($row["promo"])) {
$price $price
->getProductSaleElements() ->getProductSaleElements()
->setPromo((int)$row["promo"]) ->setPromo((int) $row["promo"])
->save() ->save()
; ;
} }
@@ -133,5 +133,4 @@ class ProductPricesImport extends ImportHandler
return ["ref", "price"]; return ["ref", "price"];
} }
} }

3
core/lib/Thelia/Tests/ImportExport/Export/ExportHandlerTest.php
View File

@@ -16,7 +16,6 @@ use Thelia\Core\FileFormat\FormatType;
use Thelia\Model\AddressQuery; use Thelia\Model\AddressQuery;
use Thelia\Model\CustomerQuery; use Thelia\Model\CustomerQuery;
use Thelia\Model\Lang; use Thelia\Model\Lang;
use Thelia\Model\Map\AddressTableMap;
use Thelia\Tests\ContainerAwareTestCase; use Thelia\Tests\ContainerAwareTestCase;
/** /**
@@ -41,12 +40,10 @@ class ExportHandlerTest extends ContainerAwareTestCase
); );
} }
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();
$this->handler = $this->getMock( $this->handler = $this->getMock(
"Thelia\\ImportExport\\Export\\ExportHandler", "Thelia\\ImportExport\\Export\\ExportHandler",
[ [

4
core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
View File

@@ -17,7 +17,6 @@ use Thelia\ImportExport\Export\Type\ProductPricesExport;
use Thelia\Model\Base\ProductSaleElementsQuery; use Thelia\Model\Base\ProductSaleElementsQuery;
use Thelia\Model\CurrencyQuery; use Thelia\Model\CurrencyQuery;
use Thelia\Model\Lang; use Thelia\Model\Lang;
use Thelia\Model\LangQuery;
/** /**
* Class ProductPricesExportTest * Class ProductPricesExportTest
@@ -47,8 +46,7 @@ class ProductPricesExportTest extends \PHPUnit_Framework_TestCase
$max = 50; $max = 50;
} }
for ($i = 0; $i < $max; ++$i) for ($i = 0; $i < $max; ++$i) {
{
$row = $rawData[$i]; $row = $rawData[$i];
$rowKeys = array_keys($row); $rowKeys = array_keys($row);

7
core/lib/Thelia/Tests/ImportExport/Export/ProductSEOExportTest.php
View File

@@ -14,11 +14,7 @@ namespace Thelia\Tests\ImportExport\Export;
use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\Container;
use Thelia\Core\Translation\Translator; use Thelia\Core\Translation\Translator;
use Thelia\ImportExport\Export\Type\ProductSEOExport; use Thelia\ImportExport\Export\Type\ProductSEOExport;
use Thelia\Model\Base\ProductAssociatedContentQuery;
use Thelia\Model\ContentI18nQuery;
use Thelia\Model\ContentQuery;
use Thelia\Model\Lang; use Thelia\Model\Lang;
use Thelia\Model\ProductAssociatedContent;
use Thelia\Model\ProductQuery; use Thelia\Model\ProductQuery;
/** /**
@@ -49,8 +45,7 @@ class ProductSEOExportTest extends \PHPUnit_Framework_TestCase
$max = 50; $max = 50;
} }
for ($i = 0; $i < $max; ++$i) for ($i = 0; $i < $max; ++$i) {
{
$row = $rawData[$i]; $row = $rawData[$i];
$rowKeys = array_keys($row); $rowKeys = array_keys($row);

3
core/lib/Thelia/Tests/ImportExport/Import/ProductPricesImportTest.php
View File

@@ -18,7 +18,6 @@ use Thelia\ImportExport\Import\Type\ProductPricesImport;
use Thelia\Model\Currency; use Thelia\Model\Currency;
use Thelia\Model\ProductSaleElementsQuery; use Thelia\Model\ProductSaleElementsQuery;
use Thelia\Tests\Controller\ControllerTestBase; use Thelia\Tests\Controller\ControllerTestBase;
use Thelia\Tests\Controller\ImportExportControllerTrait;
/** /**
* Class ProductPricesImportTest * Class ProductPricesImportTest
@@ -35,7 +34,6 @@ class ProductPricesImportTest extends ControllerTestBase
} }
/** /**
* @return \Thelia\Controller\BaseController The controller you want to test * @return \Thelia\Controller\BaseController The controller you want to test
*/ */
@@ -44,7 +42,6 @@ class ProductPricesImportTest extends ControllerTestBase
return new ImportController(); return new ImportController();
} }
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();

1
core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
View File

@@ -35,7 +35,6 @@ class ProductStockImportTest extends ControllerTestBase
return new ImportController(); return new ImportController();
} }
public function setUp() public function setUp()
{ {
parent::setUp(); parent::setUp();