Skip to content

Commit bac95ef

Browse files
committed
Merge branch 'release/v1.3.8'
2 parents 9ff6096 + 71b10f6 commit bac95ef

4 files changed

Lines changed: 20 additions & 8 deletions

File tree

app/Console/AutoImports.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ protected function getFiles(string $directory): array
8383
if ('csv' === $this->getExtension($file) && $this->hasJsonConfiguration($directory, $file)) {
8484
$return[] = $file;
8585
}
86+
87+
if ('xml' === $this->getExtension($file) && $this->hasJsonConfiguration($directory, $file)) {
88+
$return[] = $file;
89+
}
90+
8691
// import JSON with no importable file.
8792
// TODO must detect json files without accompanying camt/csv/whatever file.
8893
if ('json' === $this->getExtension($file) && !$this->hasCsvFile($directory, $file)) {
@@ -143,6 +148,8 @@ private function hasCsvFile(string $directory, string $file): bool
143148
}
144149

145150
/**
151+
* This method only works on files with an extension with exactly three letters
152+
* (ie. "csv", "xml").
146153
* @param string $directory
147154
* @param string $file
148155
*

changelog.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## 1.3.8 - 2023-09-02
6+
7+
### Fixed
8+
- [Issue 7918](https://github.com/firefly-iii/firefly-iii/issues/7918) Make sure XML file are recognized by the POST importer
9+
510
## 1.3.7 - 2023-09-02
611

712
### Fixed

config/importer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
declare(strict_types=1);
2424

2525
return [
26-
'version' => '1.3.7',
26+
'version' => '1.3.8',
2727
'flows' => ['nordigen', 'spectre', 'file'],
2828
'flow_titles' => [
2929
'file' => 'File',
@@ -43,7 +43,7 @@
4343
'ignore_duplicate_errors' => env('IGNORE_DUPLICATE_ERRORS', false),
4444
'namespace' => 'c40dcba2-411d-11ec-973a-0242ac130003',
4545
'use_cache' => env('USE_CACHE', false),
46-
'minimum_version' => '6.0.21',
46+
'minimum_version' => '6.0.22',
4747
'cache_api_calls' => false,
4848
'ignored_files' => ['.gitignore'],
4949
'tracker_site_id' => env('TRACKER_SITE_ID', ''),

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2558,9 +2558,9 @@ ee-first@1.1.1:
25582558
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
25592559

25602560
electron-to-chromium@^1.4.477:
2561-
version "1.4.507"
2562-
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.507.tgz#e99d87fcfaa6887edc18edc5dd46835df1a71f22"
2563-
integrity sha512-brvPFnO1lu3UYBpBht2qWw9qqhdG4htTjT90/9oOJmxQ77VvTxL9+ghErFqQzgj7n8268ONAmlebqjBR/S+qgA==
2561+
version "1.4.508"
2562+
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.508.tgz#5641ff2f5ba11df4bd960fe6a2f9f70aa8b9af96"
2563+
integrity sha512-FFa8QKjQK/A5QuFr2167myhMesGrhlOBD+3cYNxO9/S4XzHEXesyTD/1/xF644gC8buFPz3ca6G1LOQD0tZrrg==
25642564

25652565
elliptic@^6.5.3:
25662566
version "6.5.4"
@@ -2855,9 +2855,9 @@ forwarded@0.2.0:
28552855
integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
28562856

28572857
fraction.js@^4.2.0:
2858-
version "4.3.4"
2859-
resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.4.tgz#b2bac8249a610c3396106da97c5a71da75b94b1c"
2860-
integrity sha512-pwiTgt0Q7t+GHZA4yaLjObx4vXmmdcS0iSJ19o8d/goUGgItX9UZWKWNnLHehxviD8wU2IWRsnR8cD5+yOJP2Q==
2858+
version "4.3.6"
2859+
resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.6.tgz#e9e3acec6c9a28cf7bc36cbe35eea4ceb2c5c92d"
2860+
integrity sha512-n2aZ9tNfYDwaHhvFTkhFErqOMIb8uyzSQ+vGJBjZyanAKZVbGUQ1sngfk9FdkBw7G26O7AgNjLcecLffD1c7eg==
28612861

28622862
fresh@0.5.2:
28632863
version "0.5.2"

0 commit comments

Comments
 (0)