Skip to content

Commit 60a30e3

Browse files
committed
Merge branch 'release/0.6.2'
2 parents bd9e809 + 6c78859 commit 60a30e3

7 files changed

Lines changed: 166 additions & 155 deletions

File tree

app/Http/Controllers/Import/UploadController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ private function processCsvFile(string $flow, MessageBag $errors, UploadedFile|n
154154
$content = file_get_contents($file->getPathname());
155155

156156
// https://stackoverflow.com/questions/11066857/detect-eol-type-using-php
157-
// because apparantly there are banks that use "\r" as newline. Looking at the morons of KBC Bank, Belgium.
157+
// because apparently there are banks that use "\r" as newline. Looking at the morons of KBC Bank, Belgium.
158158
// This one is for you: 🤦‍♀️
159159
$eol = $this->detectEOL($content);
160160
if ("\r" === $eol) {

app/Services/Nordigen/Model/Account.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Account
4040
private string $linkedAccounts;
4141
private string $msisdn;
4242
private string $name;
43-
private string $ownerAddressUnstructured;
43+
private array $ownerAddressUnstructured;
4444
private string $ownerName;
4545
private string $product;
4646
private string $resourceId;
@@ -64,7 +64,7 @@ public function __construct()
6464
$this->linkedAccounts = '';
6565
$this->msisdn = '';
6666
$this->name = '';
67-
$this->ownerAddressUnstructured = '';
67+
$this->ownerAddressUnstructured = [];
6868
$this->ownerName = '';
6969
$this->product = '';
7070
$this->resourceId = '';
@@ -346,17 +346,17 @@ public function setIban(string $iban): void
346346
}
347347

348348
/**
349-
* @return string
349+
* @return array
350350
*/
351-
public function getOwnerAddressUnstructured(): string
351+
public function getOwnerAddressUnstructured(): array
352352
{
353353
return $this->ownerAddressUnstructured;
354354
}
355355

356356
/**
357-
* @param string $ownerAddressUnstructured
357+
* @param array $ownerAddressUnstructured
358358
*/
359-
public function setOwnerAddressUnstructured(string $ownerAddressUnstructured): void
359+
public function setOwnerAddressUnstructured(array $ownerAddressUnstructured): void
360360
{
361361
$this->ownerAddressUnstructured = $ownerAddressUnstructured;
362362
}

changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
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+
## 0.6.2 - 2022-01-12
6+
7+
### Fixed
8+
9+
- [Issue 5507](https://github.com/firefly-iii/firefly-iii/issues/5507) `ownerAddressUnstructured` field is of the wrong data type.
10+
- Version 0.6.1 also reports as 0.6.0.
11+
512
## 0.6.1 - 2022-01-08
613

714
### Fixed

composer.lock

Lines changed: 29 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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' => '0.6.0',
26+
'version' => '0.6.2',
2727
'flows' => ['nordigen', 'spectre', 'csv'],
2828
'flow_titles' => [
2929
'csv' => 'CSV',
@@ -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' => '5.6.8',
46+
'minimum_version' => '5.6.10',
4747
'cache_api_calls' => false,
4848
'ignored_files' => ['.gitignore'],
4949
'tracker_site_id' => env('TRACKER_SITE_ID', ''),

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"popper.js": "^1.12",
2121
"postcss": "^8.4",
2222
"resolve-url-loader": "4.0.0",
23-
"sass": "^1.43.5",
23+
"sass": "^1.47.0",
2424
"sass-loader": "12.*",
2525
"vue": "^2.6.14",
2626
"vue-loader": "^15",

0 commit comments

Comments
 (0)