TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,440 Commits 1 Branch 0 Tags
0965a846a5fafb536d0d038049d0bb519d3ffd23
Commit Graph

480 Commits

Author SHA1 Message Date
Benjamin Perche
ff16587acf Apply firewall rules only in prod environment 
modifié:         core/lib/Thelia/Controller/BaseController.php
	modifié:         core/lib/Thelia/Form/FirewallForm.php
 2014-08-13 09:49:58 +02:00
Benjamin Perche
606ad49316 Fix tests 
modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
 2014-08-05 15:32:51 +02:00
Benjamin Perche
29c0aa0368 Remove MimeTypeTools tests 
supprimé:        core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:26:56 +02:00
Benjamin Perche
ddcaf9fbab Fix tests 
modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:26:17 +02:00
Benjamin Perche
d541b56429 Fix tests 
modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:25:28 +02:00
Benjamin Perche
5d9f120c81 Fix tests and add translation 
modifié:         core/lib/Thelia/Config/I18n/en_US.php
	modifié:         core/lib/Thelia/Config/I18n/fr_FR.php
	modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
	modifié:         core/lib/Thelia/Tools/MimeTypeTools.php
	modifié:         local/config/mime.types
 2014-08-05 08:25:28 +02:00
Benjamin Perche
172d7c06ca Fix URLTest namespace 
modifié:         core/lib/Thelia/Tests/Tools/URLTest.php
 2014-08-05 08:23:15 +02:00
Benjamin Perche
d1a9115626 Fix cs 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
	modifié:         core/lib/Thelia/Tools/MimeTypeTools.php
 2014-08-05 08:23:15 +02:00
Benjamin Perche
4b2ee0d357 Fix tests 
modifié:         core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
 2014-08-05 08:23:15 +02:00
Benjamin Perche
d186ec4320 Fix security breaches 
modifié:         core/lib/Thelia/Controller/Admin/FileController.php
	nouveau fichier: core/lib/Thelia/Tests/Tools/MimeTypesToolsTest.php
	nouveau fichier: core/lib/Thelia/Tools/MimeTypeTools.php
	nouveau fichier: local/config/mime.types
 2014-08-05 08:23:15 +02:00
Benjamin Perche
60b599f8c1 Add order date 
modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
 2014-08-04 14:56:07 +02:00
Benjamin Perche
83db209adf Add document tests and use left join instead of inner join for documents 
modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
 2014-08-04 11:40:16 +02:00
Benjamin Perche
5812c92752 Fix test 
modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
 2014-08-01 13:29:24 +02:00
Benjamin Perche
0e7a1117b0 Add taxed prices export 
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ProductTaxedPricesExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ProductTaxedPricesExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
9ff74bece8 Fix cs 
modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
c85fe24d96 Add tests on OrderExport 
modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/OrderExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
e8c8857cce Finish OrderExport 
modifié:         core/lib/Thelia/ImportExport/Export/Type/OrderExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
1aded1b6d6 Fix tests 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
0d37e3470b Fix escape usage 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
40605c1893 Add content export 
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ContentExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ContentExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
c208d8bb19 Fix export 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
 2014-08-01 12:48:07 +02:00
Benjamin Perche
b2588a8fca Fix cs 
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
 2014-08-01 12:48:06 +02:00
Benjamin Perche
f891d8b788 Add ContainerAwareTestCase and ExportHandlerTest 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	nouveau fichier: core/lib/Thelia/Tests/ContainerAwareTestCase.php
	modifié:         core/lib/Thelia/Tests/Controller/ControllerTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ExportHandlerTest.php
 2014-08-01 12:48:06 +02:00
Benjamin Perche
7adc31514e Fix tests and bugs 
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
 2014-08-01 12:48:06 +02:00
Benjamin Perche
f73703c578 Add customer export 
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/ImportExport/AbstractHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/CustomerExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/CustomerExportTest.php
 2014-08-01 12:48:06 +02:00
Benjamin Perche
c5c8b4c9e4 Refactor ExportHandler to allow queries override 
modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.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/Tests/ImportExport/Export/MailingExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductSEOExportTest.php
 2014-08-01 12:48:06 +02:00
Benjamin Perche
9dfff70838 Fix Product SEO export 
modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductSEOExportTest.php
 2014-08-01 12:48:06 +02:00
Benjamin Perche
f4f3a54e9c Fix join to get translation in export 
modifié:         core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductSEOExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ProductSEOExportTest.php
 2014-08-01 12:48:06 +02:00
Benjamin Perche
1270cf6954 Add promo import and export in prices 
modifié:         core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductPricesImport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductPricesImportTest.php
 2014-08-01 12:48:05 +02:00
Benjamin Perche
dc97b65590 Fix bugs and add ProductPricesExport tests 
modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/ImportExport/Export/Type/MailingExport.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/ProductPricesExportTest.php
 2014-08-01 12:48:05 +02:00
Benjamin Perche
f83251d31d Fix tests and rename one 
renommé:         core/lib/Thelia/Tests/ImportExport/Import/ProductPriceImportTest.php -> core/lib/Thelia/Tests/ImportExport/Import/ProductPricesImportTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
 2014-08-01 12:48:05 +02:00
Benjamin Perche
a54ce50eb1 Refactor ProductPriceImport -> ProductPricesImport 
modifié:         core/lib/Thelia/Config/Resources/import.xml
	renommé:         core/lib/Thelia/ImportExport/Import/Type/ProductPriceImport.php -> core/lib/Thelia/ImportExport/Import/Type/ProductPricesImport.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductPriceImportTest.php
 2014-08-01 12:48:05 +02:00
Benjamin Perche
0e3ae84cb8 Fix bugs and add Product prices export 
modifié:         core/lib/Thelia/Config/Resources/export.xml
	modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/schema/dic/config/thelia-1.0.xsd
	nouveau fichier: core/lib/Thelia/ImportExport/Export/Type/ProductPricesExport.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
 2014-08-01 12:48:05 +02:00
Benjamin Perche
79a8390817 Fix bugs and add import count handle 
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	modifié:         core/lib/Thelia/ImportExport/Import/ImportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/CSVFormatterTest.php
 2014-08-01 12:48:05 +02:00
Benjamin Perche
27a32e64e6 Add ProductPriceImport test 
modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductPriceImport.php
	modifié:         core/lib/Thelia/Tests/Controller/ControllerTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Import/ProductPriceImportTest.php
 2014-08-01 12:48:05 +02:00
Benjamin Perche
853c74edb2 Refactor ImportExportControllerBase into a trait and finish ProductStockImportTest 
modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
	renommé:         core/lib/Thelia/Tests/Controller/ImportExportControllerTest.php -> core/lib/Thelia/Tests/Controller/ImportExportControllerTrait.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
 2014-08-01 12:48:04 +02:00
Benjamin Perche
14cf745a89 Add ImportController Tests and fix bugs 
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/Exception/FileNotFoundException.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportControllerTest.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportExportControllerTest.php
 2014-08-01 12:48:04 +02:00
Benjamin Perche
ae750866aa Define Import controller test 
modifié:         core/lib/Thelia/Tests/Controller/ControllerTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/Controller/ImportControllerTest.php
	modifié:         core/lib/Thelia/Tests/Controller/ImportExportControllerTest.php
 2014-08-01 12:48:04 +02:00
Benjamin Perche
a731873ff3 Refactor tests to add abstract class for controller tests 
modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	renommé:         core/lib/Thelia/Tests/ImportExport/Import/ImportTestBase.php -> core/lib/Thelia/Tests/Controller/ControllerTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/Controller/ImportExportControllerTest.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
 2014-08-01 12:48:04 +02:00
Benjamin Perche
a03d15b5b9 Add special condition on test 
modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/CSVFormatterTest.php
 2014-08-01 12:48:04 +02:00
Benjamin Perche
ce36b7b68e Add CSV formatter 
nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/CSVFormatter.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/CSVFormatterTest.php
 2014-08-01 12:48:04 +02:00
Benjamin Perche
a34441f376 Add tests for ImportController::processImport and ProductStockImport 
modifié:         core/lib/Thelia/Controller/Admin/ImportController.php
	modifié:         core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/XMLFormatterTest.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Import/ImportTestBase.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Import/ProductStockImportTest.php
 2014-08-01 12:48:04 +02:00
Benjamin Perche
00ba277daa Done XML formatter 
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/XMLFormatterTest.php
 2014-08-01 12:48:04 +02:00
Benjamin Perche
b86683a580 Refactor some classes namespaces 
modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	renommé:         core/lib/Thelia/ImportExport/DocumentsExportInterface.php -> core/lib/Thelia/ImportExport/Export/DocumentsExportInterface.php
	renommé:         core/lib/Thelia/ImportExport/ImagesExportInterface.php -> core/lib/Thelia/ImportExport/Export/ImagesExportInterface.php
	renommé:         core/lib/Thelia/ImportExport/Export/MailingExport.php -> core/lib/Thelia/ImportExport/Export/Type/MailingExport.php
	renommé:         core/lib/Thelia/ImportExport/Import/ProductStockImport.php -> core/lib/Thelia/ImportExport/Import/Type/ProductStockImport.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php
 2014-08-01 12:48:03 +02:00
Benjamin Perche
a6f008fde2 Refactor and fix CS 
modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	modifié:         core/lib/Thelia/Core/DependencyInjection/Loader/XmlFileLoader.php
	modifié:         core/lib/Thelia/Core/Event/ImportExport/Export.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	renommé:         core/lib/Thelia/ImportExport/Export/ExportType.php -> core/lib/Thelia/Core/FileFormat/FormatType.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/JsonFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Formatter.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ImportExportCategory.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php
	modifié:         core/lib/Thelia/Form/ImportForm.php
	renommé:         core/lib/Thelia/ImportExport/ExportHandler.php -> core/lib/Thelia/ImportExport/AbstractHandler.php
	nouveau fichier: core/lib/Thelia/ImportExport/Export/ExportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Export/MailingExport.php
	renommé:         core/lib/Thelia/ImportExport/ImportHandler.php -> core/lib/Thelia/ImportExport/Import/ImportHandler.php
	modifié:         core/lib/Thelia/ImportExport/Import/ProductStockImport.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
	modifié:         core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php
	modifié:         core/lib/Thelia/Tools/URL.php
	modifié:         templates/backOffice/default/ajax/import-modal.html
 2014-08-01 12:48:03 +02:00
Benjamin Perche
b6937ab421 Finish export forms 
modifié:         core/lib/Thelia/Config/Resources/config.xml
	modifié:         core/lib/Thelia/Config/Resources/form.xml
	modifié:         core/lib/Thelia/Controller/Admin/ExportController.php
	modifié:         core/lib/Thelia/Controller/Admin/ImportExportController.php
	modifié:         core/lib/Thelia/Core/Template/Loop/Formatter.php
	modifié:         core/lib/Thelia/Core/Template/Loop/ImportExportType.php
	modifié:         core/lib/Thelia/Form/ExportForm.php
	modifié:         core/lib/Thelia/ImportExport/Both/NewsletterImportExport.php
	modifié:         core/lib/Thelia/ImportExport/Export/MailingExport.php
	renommé:         core/lib/Thelia/ImportExport/ExportHandlerInterface.php -> core/lib/Thelia/ImportExport/ExportHandler.php
	modifié:         core/lib/Thelia/Model/Export.php
	modifié:         core/lib/Thelia/Model/Import.php
	nouveau fichier: core/lib/Thelia/Tests/ImportExport/Export/MailingExportTest.php
	nouveau fichier: templates/backOffice/default/ajax/export-modal.html
	modifié:         templates/backOffice/default/export-page.html
	modifié:         templates/backOffice/default/export.html
 2014-08-01 12:48:02 +02:00
Benjamin Perche
45bb5a7bfb Revert files 
modifié:         core/lib/Thelia/Core/FileFormat/Archive/AbstractArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/TarArchiveException.php
	supprimé:        core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/Exception/ZipArchiveException.php~HEAD
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilder.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Archive/ArchiveBuilderManager.php
	modifié:         core/lib/Thelia/Core/FileFormat/FormatInterface.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/JsonFormatter.php
	nouveau fichier: core/lib/Thelia/Core/FileFormat/Formatting/Formatter/XMLFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/Tests/Action/FolderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarBz2ArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TarGzArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/TestResources/bad_formatted.tar
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilder/ZipArchiveBuilderTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Archive/ArchiveBuilderManagerTest.php
	nouveau fichier: core/lib/Thelia/Tests/FileFormat/Formatting/Formatter/XMLFormatterTest.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/FormatterDataTest.php
	modifié:         core/lib/Thelia/Tests/Tools/FakeFileDownloader.php
	modifié:         core/lib/Thelia/Tests/Tools/FileDownloaderTest.php
	modifié:         core/lib/Thelia/Tools/FileDownload/FileDownloader.php
	modifié:         core/lib/Thelia/Tools/FileDownload/FileDownloaderAwareTrait.php
	modifié:         core/lib/Thelia/Tools/FileDownload/FileDownloaderInterface.php
 2014-08-01 12:48:02 +02:00
Benjamin Perche
168cb31253 Remove FileManagerTest 
supprimé:        core/lib/Thelia/Tests/Tools/FileManagerTest.php
 2014-08-01 12:48:01 +02:00
Benjamin Perche
7ccb32badb Remove conflicts 
modifié:         core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	modifié:         core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	modifié:         core/lib/Thelia/Tests/FileFormat/Formatting/FormatterDataTest.php
 2014-08-01 12:48:01 +02:00
Benjamin Perche
2b19d1fe33 End formatter data and refactor Thelia\Core\FileFormat\Formatter 
renommé:         core/lib/Thelia/Core/FileFormat/Formatter/AbstractFormatter.php -> core/lib/Thelia/Core/FileFormat/Formatting/AbstractFormatter.php
	renommé:         core/lib/Thelia/Core/FileFormat/Formatter/Exception/BadFormattedStringException.php -> core/lib/Thelia/Core/FileFormat/Formatting/Exception/BadFormattedStringException.php
	renommé:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterData.php -> core/lib/Thelia/Core/FileFormat/Formatting/FormatterData.php
	renommé:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterInterface.php -> core/lib/Thelia/Core/FileFormat/Formatting/FormatterInterface.php
	renommé:         core/lib/Thelia/Core/FileFormat/Formatter/FormatterManager.php -> core/lib/Thelia/Core/FileFormat/Formatting/FormatterManager.php
	renommé:         core/lib/Thelia/Tests/FileFormat/Formatter/FormatterDataTest.php -> core/lib/Thelia/Tests/FileFormat/Formatting/FormatterDataTest.php
	renommé:         core/lib/Thelia/Tests/FileFormat/Formatter/FormatterManagerTest.php -> core/lib/Thelia/Tests/FileFormat/Formatting/FormatterManagerTest.php
 2014-08-01 12:48:01 +02:00