SUPESC-158 Adjusted CSV dataimport validation, twig path reader. (#10…

…906) SUPESC-158 Adjusted CSV dataimport validation, twig path reader.
spryker · Apr 17, 2024 · 4edd0fe · 4edd0fe
1 parent c0a9749
commit 4edd0fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/Spryker/Zed/DataImport/Business/Model/DataReader/CsvReader/CsvReader.php b/src/Spryker/Zed/DataImport/Business/Model/DataReader/CsvReader/CsvReader.php
@@ -8,14 +8,14 @@
 namespace Spryker\Zed\DataImport\Business\Model\DataReader\CsvReader;
 
 use Countable;
-use Exception;
 use Generated\Shared\Transfer\DataImporterReaderConfigurationTransfer;
 use SplFileObject;
 use Spryker\Zed\DataImport\Business\Exception\DataReaderException;
 use Spryker\Zed\DataImport\Business\Exception\DataSetWithHeaderCombineFailedException;
 use Spryker\Zed\DataImport\Business\Model\DataReader\ConfigurableDataReaderInterface;
 use Spryker\Zed\DataImport\Business\Model\DataReader\DataReaderInterface;
 use Spryker\Zed\DataImport\Business\Model\DataSet\DataSetInterface;
+use ValueError;
 
 class CsvReader implements DataReaderInterface, ConfigurableDataReaderInterface, Countable
 {
@@ -173,7 +173,7 @@ public function current(): DataSetInterface
             try {
                 /** @var array $dataSet */
                 $dataSet = array_combine($this->dataSetKeys, $dataSet);
-            } catch (Exception $e) {
+            } catch (ValueError $e) {
                 throw new DataSetWithHeaderCombineFailedException(sprintf(
                     'Can not combine data set header with current data set. Keys: "%s", Values "%s"',
                     implode(', ', $this->dataSetKeys),

diff --git a/tests/SprykerTest/Zed/DataImport/Business/Model/DataReader/CsvReader/CsvReaderTest.php b/tests/SprykerTest/Zed/DataImport/Business/Model/DataReader/CsvReader/CsvReaderTest.php
@@ -15,7 +15,6 @@
 use Spryker\Zed\DataImport\Business\Exception\DataSetWithHeaderCombineFailedException;
 use Spryker\Zed\DataImport\Business\Model\DataReader\CsvReader\CsvReaderConfiguration;
 use Spryker\Zed\DataImport\Business\Model\DataSet\DataSet;
-use ValueError;
 
 /**
  * Auto-generated group annotations
@@ -227,8 +226,7 @@ public function testThrowsExceptionWhenFileInvalid(): void
      */
     public function testThrowsExceptionWhenHeaderAndDataSetLengthDoesNotMatch(): void
     {
-        $exceptionClass = ValueError::class;
-        $this->expectException($exceptionClass);
+        $this->expectException(DataSetWithHeaderCombineFailedException::class);
         $csvReader = $this->getCsvReader(Configuration::dataDir() . 'import-header-dataset-length-missmatch.csv');
 
         $csvReader->current();