Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.{js,json,vue,css,less,scss}]
indent_size = 2

[Makefile]
indent_style = tab
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
php_version: ["7.4", "8.0", "8.1", "8.2", "8.3"]
php_version: ["7.4", "8.0", "8.1", "8.2", "8.3", "8.4", "8.5"]

runs-on: ubuntu-latest
container:
Expand Down
2 changes: 1 addition & 1 deletion Subscriber/ValidateCSVHeadersSubscriber.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function onValidateSource(ImportValidateEvent $event): void
fseek($fh, 0);
}

$headers = fgetcsv($fh, 0, $config['load']['format_options']['field_delimiter']);
$headers = fgetcsv($fh, 0, $config['load']['format_options']['field_delimiter'], '"', '');
fclose($fh);

$expectedHeaders = array_keys($config['load']['fields']);
Expand Down
2 changes: 1 addition & 1 deletion Tests/Load/CsvLoaderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ private function createCsv(string $csvContent): array
fseek($handle, 0);
$data = [];

while ($row = fgetcsv($handle)) {
while ($row = fgetcsv($handle, null, ',', '"', '')) {
$data[] = $row;
}

Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
"monolog/monolog": "^2.0|^3.0",
"neitanod/forceutf8": "^2.0.4",
"psr/log": "^1.0|^2.0|^3.0",
"symfony/config": "^5.4|^6.0|^7.0",
"symfony/event-dispatcher": "^5.4|^6.0|^7.0",
"symfony/finder": "^5.4|^6.0|^7.0",
"symfony/string": "^5.4|^6.0|^7.0",
"symfony/config": "^5.4|^6.0|^7.0|^8.0",
"symfony/event-dispatcher": "^5.4|^6.0|^7.0|^8.0",
"symfony/finder": "^5.4|^6.0|^7.0|^8.0",
"symfony/string": "^5.4|^6.0|^7.0|^8.0",
"symfony/translation-contracts": "^1|^2|^3"
},
"autoload": {
Expand Down Expand Up @@ -59,7 +59,7 @@
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.4",
"phpunit/phpunit": "^9.6",
"symfony/phpunit-bridge": "^5.4|^6.0|^7.0"
"symfony/phpunit-bridge": "^5.4|^6.0|^7.0|^8.0"
},
"scripts": {
"analyse": "./vendor/bin/phpstan analyse --no-progress",
Expand Down
1 change: 1 addition & 0 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ parameters:
message: '#Call to an undefined method Symfony\\Component\\Config\\Definition\\Builder\\NodeDefinition::.+\(\)#'
paths:
- ImportConfiguration.php
reportUnmatchedIgnoredErrors: false # required for different versions of Symfony
tmpDir: .phpstan.cache
3 changes: 3 additions & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" failOnRisky="true" failOnWarning="true">
<php>
<env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
</php>
<coverage>
<include>
<directory>./</directory>
Expand Down