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

Add ImportController Tests and fix bugs

Browse Source 
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
This commit is contained in:
Benjamin Perche
2014-07-21 10:36:40 +02:00
parent ae750866aa
commit 14cf745a89
4 changed files with 201 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/lib/Thelia/Controller/Admin/ImportController.php
View File

@@ -24,6 +24,7 @@ use Thelia\Core\Security\AccessManager;
use Thelia\Core\Security\Resource\AdminResources;
use Thelia\Core\Template\Element\LoopResult;
use Thelia\Core\Template\Loop\Import as ImportLoop;
use Thelia\Exception\FileNotFoundException;
use Thelia\Form\Exception\FormValidationException;
use Thelia\Form\ImportForm;
use Thelia\ImportExport\Import\ImportHandler;
@@ -160,7 +161,7 @@ class ImportController extends BaseAdminController
return $this->importView($id);
}
protected function getFileContentInArchive(
public function getFileContentInArchive(
AbstractArchiveBuilder $archiveBuilder,
FormatterManager $formatterManager,
array $types
@@ -184,7 +185,7 @@ class ImportController extends BaseAdminController
}
if ($content === null) {
throw new \ErrorException(
throw new FileNotFoundException(
$this->getTranslator()->trans(
"Your archive must contain one of these file and doesn't: %files",
[
@@ -252,14 +253,14 @@ class ImportController extends BaseAdminController
public function checkFileExtension($fileName, $uploadFormat)
{
$splitName = explode(".", $fileName);
$ext = "";
if (1 < $limit = count($splitName)) {
$ext = "." . $splitName[$limit-1];
}
if ($uploadFormat === null) {
$splitName = explode(".", $fileName);
$ext = "";
if (1 < $limit = count($splitName)) {
$ext = "." . $splitName[$limit-1];
}
throw new FormValidationException(
$this->getTranslator()->trans(
"The extension \"%ext\" is not allowed",