diff --git a/Utils/IO/Csv/CsvDatabaseMapper.php b/Utils/IO/Csv/CsvDatabaseMapper.php index c33062d48..0ec5fc702 100644 --- a/Utils/IO/Csv/CsvDatabaseMapper.php +++ b/Utils/IO/Csv/CsvDatabaseMapper.php @@ -166,7 +166,7 @@ class CsvDatabaseMapper implements IODatabaseMapper // update data while (($cells = \fgetcsv($fp)) !== false) { $query = new Builder($this->con); - $query->update($titles)->into($table); + $query->update(...$titles)->into($table); for ($j = 2; $j <= $columns; ++$j) { $query->sets((string) $titles[$j - 2], $cells[$j - 1]); diff --git a/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php b/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php index 2c33deaf5..fa0d18a59 100755 --- a/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php +++ b/Utils/IO/Spreadsheet/SpreadsheetDatabaseMapper.php @@ -221,7 +221,7 @@ class SpreadsheetDatabaseMapper implements IODatabaseMapper $line = 2; while (!empty($workSheet->getCell('A' . $line)->getCalculatedValue())) { $query = new Builder($this->con); - $query->update($titles)->into($table); + $query->update(...$titles)->into($table); for ($j = 2; $j <= $columns; ++$j) { $query->sets((string) $titles[$j - 2], $workSheet->getCell(StringUtils::intToAlphabet($j) . $line)->getCalculatedValue()); diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php index bdb807508..88872816d 100755 --- a/tests/Bootstrap.php +++ b/tests/Bootstrap.php @@ -7,13 +7,8 @@ declare(strict_types=1); \error_reporting(\E_ALL); \setlocale(\LC_ALL, 'en_US.UTF-8'); -if (\is_file('vendor/autoload.php')) { - include_once __DIR__ . '/vendor/autoload.php'; -} elseif (\is_file('../../vendor/autoload.php')) { - include_once __DIR__ . '/../../vendor/autoload.php'; -} - -require_once __DIR__ . '/../Autoloader.php'; +require_once __DIR__ . '/../vendor/autoload.php'; +require_once __DIR__ . '/Autoloader.php'; use phpOMS\DataStorage\Database\DatabasePool; use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;