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

Fix columns diff finding

Browse Source 
modifié:         core/lib/Thelia/ImportExport/Import/ImportHandler.php
This commit is contained in:
Benjamin Perche
2014-07-21 16:46:08 +02:00
parent 2a56864f94
commit abde3799d5
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/lib/Thelia/ImportExport/Import/ImportHandler.php
View File

@@ -43,12 +43,22 @@ abstract class ImportHandler extends AbstractHandler
protected function checkMandatoryColumns(array $row) protected function checkMandatoryColumns(array $row)
{ {
$mandatoryColumns = $this->getMandatoryColumns(); $mandatoryColumns = $this->getMandatoryColumns();
if ($mandatoryColumns != $keys = array_keys($row)) { sort($mandatoryColumns);
$diff = [];
foreach ($mandatoryColumns as $name) {
if (!isset($row[$name]) || empty($row[$name])) {
$diff[] = $name;
}
}
if (!empty($diff)) {
throw new \UnexpectedValueException( throw new \UnexpectedValueException(
$this->translator->trans( $this->translator->trans(
"The following columns are missing: %columns", "The following columns are missing: %columns",
[ [
"%columns" => implode(", ", array_diff($keys, $mandatoryColumns)), "%columns" => implode(", ", $diff),
] ]
) )
); );