Merge pull request #302 from firefly-iii/develop

Release v1.2.0

.ci/php-cs-fixer/composer.json

@@ -1,5 +1,5 @@
 {
     "require": {
-        "friendsofphp/php-cs-fixer": "^3.12"
+        "friendsofphp/php-cs-fixer": "^3"
     }
 }

.github/workflows/qodana.yml

@@ -0,0 +1,37 @@
+name: Qodana
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+jobs:
+  qodana:
+    runs-on: ubuntu-latest
+    name: 'Qodana Scan'
+    steps:
+      - name: Setup PHP with no coverage driver
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.2'
+          coverage: none
+          extensions: bcmath, intl
+        env:
+          update: true
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - name: Install dependencies
+        run: |
+          composer install --no-scripts
+          cp .env.example .env
+          php artisan key:generate
+          php artisan clear-compiled
+          php artisan ide-helper:generate;
+
+      - name: 'Qodana Scan'
+        uses: JetBrains/qodana-action@main
+        env:
+          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

app/Services/CSV/Conversion/Task/Accounts.php

@@ -236,10 +236,10 @@ private function processTransaction(array $transaction): array
                 if ($transaction['currency_code'] !== $source['currency_code']
                     && $transaction['foreign_currency_code'] === $source['currency_code']) {
                     app('log')->debug('Source account accepts %s, so foreign / native numbers are switched now.');
-                    $amount                               = $transaction['amount'];
-                    $currency                             = $transaction['currency_code'];
-                    $transaction['amount']                = $transaction['foreign_amount'];
-                    $transaction['currency_code']         = $transaction['foreign_currency_code'];
+                    $amount                               = $transaction['amount'] ?? '0';
+                    $currency                             = $transaction['currency_code'] ?? '';
+                    $transaction['amount']                = $transaction['foreign_amount'] ?? '0';
+                    $transaction['currency_code']         = $transaction['foreign_currency_code'] ?? '';
                     $transaction['foreign_amount']        = $amount;
                     $transaction['foreign_currency_code'] = $currency;
                 }
@@ -251,10 +251,10 @@ private function processTransaction(array $transaction): array
                 if ($transaction['currency_code'] !== $destination['currency_code']
                     && $transaction['foreign_currency_code'] === $destination['currency_code']) {
                     app('log')->debug('Destination account accepts %s, so foreign / native numbers are switched now.');
-                    $amount                               = $transaction['amount'];
-                    $currency                             = $transaction['currency_code'];
-                    $transaction['amount']                = $transaction['foreign_amount'];
-                    $transaction['currency_code']         = $transaction['foreign_currency_code'];
+                    $amount                               = $transaction['amount'] ?? '0';
+                    $currency                             = $transaction['currency_code'] ?? '';
+                    $transaction['amount']                = $transaction['foreign_amount'] ?? '0';
+                    $transaction['currency_code']         = $transaction['foreign_currency_code'] ?? '';
                     $transaction['foreign_amount']        = $amount;
                     $transaction['foreign_currency_code'] = $currency;
                 }
@@ -682,6 +682,11 @@ private function setDestination(array $transaction, array $source): array
      */
     private function hasAllCurrencies(array $transaction): bool
     {
+        $transaction['foreign_currency_code'] = $transaction['foreign_currency_code'] ?? '';
+        $transaction['currency_code']         = $transaction['currency_code'] ?? '';
+        $transaction['amount']                = $transaction['amount'] ?? '';
+        $transaction['foreign_amount']        = $transaction['foreign_amount'] ?? '';
+
         return '' !== (string)$transaction['currency_code'] && '' !== (string)$transaction['foreign_currency_code']
                && '' !== (string)$transaction['amount']
                && '' !== (string)$transaction['foreign_amount'];

changelog.md

@@ -2,6 +2,14 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.2.0 - 2023-03-13
+
+### Fixed
+- [Issue 7207](https://github.com/firefly-iii/firefly-iii/issues/7207) Missing key validation
+
+### Changed
+- This release will only work with Firefly III v6.0.3
+
 ## 1.1.0 - 2023-03-12
 
 ### Added

config/importer.php

@@ -23,7 +23,7 @@
 declare(strict_types=1);
 
 return [
-    'version'                 => '1.1.0',
+    'version'                 => '1.2.0',
     'flows'                   => ['nordigen', 'spectre', 'file'],
     'flow_titles'             => [
         'file'     => 'File',
@@ -43,7 +43,7 @@
     'ignore_duplicate_errors' => env('IGNORE_DUPLICATE_ERRORS', false),
     'namespace'               => 'c40dcba2-411d-11ec-973a-0242ac130003',
     'use_cache'               => env('USE_CACHE', false),
-    'minimum_version'         => '5.7.18',
+    'minimum_version'         => '6.0.3',
     'cache_api_calls'         => false,
     'ignored_files'           => ['.gitignore'],
     'tracker_site_id'         => env('TRACKER_SITE_ID', ''),

qodana.yaml

@@ -0,0 +1,9 @@
+profile:
+  name: qodana.recommended
+version: "1.0"
+linter: jetbrains/qodana-php:2022.3-eap
+exclude:
+  - name: All
+    paths:
+      - .ci
+      - _ide_helper.php