Auto commit for release 'develop' on 2024-04-20

app/Console/AutoImports.php

@@ -70,7 +70,7 @@ private function getFiles(string $directory): array
 
  return [];
  }
- $array = scandir($directory);
+ $array  = scandir($directory);
  if (!is_array($array)) {
  $this->error(sprintf('Directory "%s" is empty or invalid.', $directory));
 
@@ -196,9 +196,9 @@ private function importFile(string $directory, string $file): void
  {
  app('log')->debug(sprintf('ImportFile: directory "%s"', $directory));
  app('log')->debug(sprintf('ImportFile: file "%s"', $file));
- $importableFile = sprintf('%s/%s', $directory, $file);
- $jsonFile = sprintf('%s/%s.json', $directory, substr($file, 0, -5));
- $fallbackJsonFile = sprintf('%s/%s', $directory, config('importer.fallback_configuration'));
+ $importableFile  = sprintf('%s/%s', $directory, $file);
+ $jsonFile  = sprintf('%s/%s.json', $directory, substr($file, 0, -5));
+ $fallbackJsonFile  = sprintf('%s/%s', $directory, config('importer.fallback_configuration'));
 
  // TODO not yet sure why the distinction is necessary.
  // TODO this may also be necessary for camt files.
@@ -217,20 +217,20 @@ private function importFile(string $directory, string $file): void
  $this->error(sprintf('No JSON configuration found. Checked for both "%s" and "%s"', $jsonFile, $fallbackJsonFile));
  }
 
- $jsonFile = $jsonFileExists ? $jsonFile : $fallbackJsonFile;
+ $jsonFile  = $jsonFileExists ? $jsonFile : $fallbackJsonFile;
 
  app('log')->debug(sprintf('ImportFile: importable "%s"', $importableFile));
  app('log')->debug(sprintf('ImportFile: JSON "%s"', $jsonFile));
 
  // do JSON check
- $jsonResult = $this->verifyJSON($jsonFile);
+ $jsonResult  = $this->verifyJSON($jsonFile);
  if (false === $jsonResult) {
  $message = sprintf('The importer can\'t import %s: could not decode the JSON in config file %s.', $importableFile, $jsonFile);
  $this->error($message);
 
  return;
  }
- $configuration = Configuration::fromArray(json_decode(file_get_contents($jsonFile), true));
+ $configuration  = Configuration::fromArray(json_decode(file_get_contents($jsonFile), true));
 
  // sanity check. If the importableFile is a .json file, and it parses as valid json, don't import it:
  if ('file' === $configuration->getFlow() && str_ends_with(strtolower($importableFile), '.json') && $this->verifyJSON($importableFile)) {
@@ -293,6 +293,7 @@ private function reportBalanceDifferences(Configuration $configuration): void
  // check if account exists:
  if (!array_key_exists($account->getIdentifier(), $localAccounts)) {
  Log::debug(sprintf('Nordigen account "%s" (IBAN "%s") is not being imported, so skipped.', $account->getIdentifier(), $account->getIban()));
+
  continue;
  }
  // local account ID exists, we can check the balance over at Firefly III.
@@ -307,10 +308,12 @@ private function reportBalanceDifferences(Configuration $configuration): void
  } catch (ApiHttpException $e) {
  app('log')->error('Could not get Firefly III account for balance check. Will ignore this issue.');
  app('log')->debug($e->getMessage());
+
  continue;
  }
+
  /** @var LocalAccount $localAccount */
- $localAccount = $result->getAccount();
+ $localAccount  = $result->getAccount();
 
  $this->reportBalanceDifference($account, $localAccount);
  }
@@ -320,15 +323,16 @@ private function reportBalanceDifference(Account $account, LocalAccount $localAc
  {
  Log::debug(sprintf('Report balance difference between Nordigen account "%s" and Firefly III account #%d.', $account->getIdentifier(), $localAccount->id));
  app('log')->debug(sprintf('Nordigen account has %d balance entry (entries)', count($account->getBalances())));
+
  /** @var Balance $balance */
  foreach ($account->getBalances() as $index => $balance) {
  app('log')->debug(sprintf('Now comparing balance entry #%d of %d', $index + 1, count($account->getBalances())));
  $this->reportSingleDifference($account, $localAccount, $balance);
  }
  }
 
- private function reportSingleDifference(Account $account, LocalAccount $localAccount, Balance $balance): void {
-
+ private function reportSingleDifference(Account $account, LocalAccount $localAccount, Balance $balance): void
+ {
  // compare currencies, and warn if necessary.
  if ($balance->currency !== $localAccount->currencyCode) {
  app('log')->warning(sprintf('Nordigen account "%s" has currency %s, Firefly III account #%d uses %s.', $account->getIdentifier(), $localAccount->id, $balance->currency, $localAccount->currencyCode));
@@ -371,7 +375,7 @@ private function startConversion(Configuration $configuration, string $importabl
  exit(1);
  }
 
- $manager = null;
+ $manager  = null;
  if ('file' === $flow) {
  $contentType = $configuration->getContentType();
  if ('unknown' === $contentType) {
@@ -411,7 +415,7 @@ private function startConversion(Configuration $configuration, string $importabl
 
  // then push stuff into the routine:
  $manager->setConfiguration($configuration);
- $transactions = [];
+ $transactions  = [];
 
  try {
  $transactions = $manager->start();
@@ -431,7 +435,7 @@ private function startConversion(Configuration $configuration, string $importabl
  }
 
  // save transactions in 'jobs' directory under the same key as the conversion thing.
- $disk = \Storage::disk('jobs');
+ $disk  = \Storage::disk('jobs');
 
  try {
  $disk->put(sprintf('%s.json', $this->identifier), json_encode($transactions, JSON_PRETTY_PRINT | JSON_THROW_ON_ERROR));
@@ -452,7 +456,7 @@ private function startConversion(Configuration $configuration, string $importabl
  $this->conversionWarnings = $manager->getAllWarnings();
  $this->conversionErrors = $manager->getAllErrors();
  }
- $this->importerAccounts = $manager->getServiceAccounts();
+ $this->importerAccounts  = $manager->getServiceAccounts();
  }
 
  private function reportConversion(): void
@@ -480,15 +484,15 @@ private function reportConversion(): void
  private function startImport(Configuration $configuration): void
  {
  app('log')->debug(sprintf('Now at %s', __METHOD__));
- $routine = new RoutineManager($this->identifier);
+ $routine  = new RoutineManager($this->identifier);
  SubmissionStatusManager::startOrFindSubmission($this->identifier);
- $disk = \Storage::disk('jobs');
- $fileName = sprintf('%s.json', $this->identifier);
+ $disk  = \Storage::disk('jobs');
+ $fileName  = sprintf('%s.json', $this->identifier);
 
  // get files from disk:
  if (!$disk->has($fileName)) {
  SubmissionStatusManager::setSubmissionStatus(SubmissionStatus::SUBMISSION_ERRORED, $this->identifier);
- $message = sprintf('File "%s" not found, cannot continue.', $fileName);
+ $message  = sprintf('File "%s" not found, cannot continue.', $fileName);
  $this->error($message);
  SubmissionStatusManager::addError($this->identifier, 0, $message);
  $this->importMessages = $routine->getAllMessages();
@@ -502,9 +506,9 @@ private function startImport(Configuration $configuration): void
  $json = $disk->get($fileName);
  $transactions = json_decode($json, true, 512, JSON_THROW_ON_ERROR);
  app('log')->debug(sprintf('Found %d transactions on the drive.', count($transactions)));
- } catch (FileNotFoundException | \JsonException $e) {
+ } catch (FileNotFoundException|\JsonException $e) {
  SubmissionStatusManager::setSubmissionStatus(SubmissionStatus::SUBMISSION_ERRORED, $this->identifier);
- $message = sprintf('File "%s" could not be decoded, cannot continue..', $fileName);
+ $message  = sprintf('File "%s" could not be decoded, cannot continue..', $fileName);
  $this->error($message);
  SubmissionStatusManager::addError($this->identifier, 0, $message);
  $this->importMessages = $routine->getAllMessages();
@@ -583,7 +587,7 @@ private function reportImport(): void
  private function importUpload(string $jsonFile, string $importableFile): void
  {
  // do JSON check
- $jsonResult = $this->verifyJSON($jsonFile);
+ $jsonResult  = $this->verifyJSON($jsonFile);
  if (false === $jsonResult) {
  $message = sprintf('The importer can\'t import %s: could not decode the JSON in config file %s.', $importableFile, $jsonFile);
  $this->error($message);

app/Console/Commands/Import.php

@@ -129,8 +129,6 @@ public function handle(): int
  $this->line('--------');
  $this->line('Running...');
 
-
-
  // first do conversion based on the file:
  $this->startConversion($configuration, $file);
  $this->reportConversion();

app/Services/CSV/Conversion/RoutineManager.php

@@ -196,7 +196,9 @@ private function mergeErrors(int $count): void
  $count
  );
  }
- #[\Override] public function getServiceAccounts(): array
+
+ #[\Override]
+ public function getServiceAccounts(): array
  {
  return [];
  }

app/Services/Camt/Conversion/RoutineManager.php

@@ -199,7 +199,8 @@ private function mergeErrors(int $count): void
  );
  }
 
- #[\Override] public function getServiceAccounts(): array
+ #[\Override]
+ public function getServiceAccounts(): array
  {
  return [];
  }

app/Services/Nordigen/Conversion/Routine/TransactionProcessor.php

@@ -59,7 +59,7 @@ public function download(): array
  app('log')->debug(sprintf('Now in %s', __METHOD__));
  $this->notBefore = null;
  $this->notAfter = null;
- $this->accounts = [];
+ $this->accounts  = [];
  if ('' !== $this->configuration->getDateNotBefore()) {
  $this->notBefore = new Carbon($this->configuration->getDateNotBefore());
  }
@@ -78,7 +78,8 @@ public function download(): array
  app('log')->debug('Will also download information on the account for debug purposes.');
  $object = new Account();
  $object->setIdentifier($account);
- $fullInfo = null;
+ $fullInfo = null;
+
  try {
  $fullInfo = AccountInformationCollector::collectInformation($object);
  } catch (AgreementExpiredException $e) {
@@ -97,7 +98,7 @@ public function download(): array
  continue;
  }
  app('log')->debug('Done downloading information for debug purposes.');
- if(null !== $fullInfo) {
+ if (null !== $fullInfo) {
  $this->accounts[] = $fullInfo;
  }
 
@@ -202,6 +203,4 @@ public function getAccounts(): array
  {
  return $this->accounts;
  }
-
-
 }

app/Services/Nordigen/Conversion/RoutineManager.php

@@ -206,7 +206,8 @@ private function mergeErrors(int $count): void
  );
  }
 
- #[\Override] public function getServiceAccounts(): array
+ #[\Override]
+ public function getServiceAccounts(): array
  {
  return $this->transactionProcessor->getAccounts();
  }

app/Services/Spectre/Conversion/RoutineManager.php

@@ -164,7 +164,9 @@ private function mergeErrors(int $count): void
  $count
  );
  }
- #[\Override] public function getServiceAccounts(): array
+
+ #[\Override]
+ public function getServiceAccounts(): array
  {
  return [];
  }

app/Services/Spectre/Request/Request.php

@@ -89,10 +89,10 @@ protected function authenticatedGet(): array
  if (0 !== count($this->parameters)) {
  $fullUrl = sprintf('%s?%s', $fullUrl, http_build_query($this->parameters));
  }
- $client = $this->getClient();
- $res = null;
- $body = null;
- $json = null;
+ $client  = $this->getClient();
+ $res  = null;
+ $body  = null;
+ $json  = null;
 
  try {
  $res = $client->request(
@@ -210,8 +210,8 @@ protected function sendSignedSpectrePost(array $data): array
  if ('' === $this->url) {
  throw new ImporterErrorException('No Spectre server defined');
  }
- $fullUrl = sprintf('%s/%s', $this->getBase(), $this->getUrl());
- $headers = $this->getDefaultHeaders();
+ $fullUrl  = sprintf('%s/%s', $this->getBase(), $this->getUrl());
+ $headers  = $this->getDefaultHeaders();
 
  try {
  $body = json_encode($data, JSON_THROW_ON_ERROR);
@@ -224,7 +224,7 @@ protected function sendSignedSpectrePost(array $data): array
  try {
  $client = $this->getClient();
  $res = $client->request('POST', $fullUrl, ['headers' => $headers, 'body' => $body]);
- } catch (\Exception | GuzzleException $e) {
+ } catch (\Exception|GuzzleException $e) {
  throw new ImporterHttpException(sprintf('Guzzle Exception: %s', $e->getMessage()));
  }
 
@@ -235,8 +235,8 @@ protected function sendSignedSpectrePost(array $data): array
  $body = '{}';
  }
 
- $statusCode = $res->getStatusCode();
- $responseHeaders = $res->getHeaders();
+ $statusCode  = $res->getStatusCode();
+ $responseHeaders  = $res->getHeaders();
 
  try {
  $json = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
@@ -274,10 +274,10 @@ protected function sendUnsignedSpectrePost(array $data): array
  if ('' === $this->url) {
  throw new ImporterErrorException('No Spectre server defined');
  }
- $fullUrl = sprintf('%s/%s', $this->getBase(), $this->getUrl());
- $headers = $this->getDefaultHeaders();
- $opts = ['headers' => $headers];
- $body = null;
+ $fullUrl  = sprintf('%s/%s', $this->getBase(), $this->getUrl());
+ $headers  = $this->getDefaultHeaders();
+ $opts  = ['headers' => $headers];
+ $body  = null;
 
  try {
  $body = json_encode($data, JSON_THROW_ON_ERROR);
@@ -293,7 +293,7 @@ protected function sendUnsignedSpectrePost(array $data): array
  try {
  $client = $this->getClient();
  $res = $client->request('POST', $fullUrl, $opts);
- } catch (\Exception | GuzzleException $e) {
+ } catch (\Exception|GuzzleException $e) {
  app('log')->error($e->getMessage());
 
  throw new ImporterHttpException(sprintf('Guzzle Exception: %s', $e->getMessage()));
@@ -306,8 +306,8 @@ protected function sendUnsignedSpectrePost(array $data): array
  $body = '{}';
  }
 
- $statusCode = $res->getStatusCode();
- $responseHeaders = $res->getHeaders();
+ $statusCode  = $res->getStatusCode();
+ $responseHeaders  = $res->getHeaders();
 
  try {
  $json = json_decode($body, true, 512, JSON_THROW_ON_ERROR);
@@ -329,10 +329,10 @@ protected function sendUnsignedSpectrePut(array $data): array
  if ('' === $this->url) {
  throw new ImporterErrorException('No Spectre server defined');
  }
- $fullUrl = sprintf('%s/%s', $this->getBase(), $this->getUrl());
- $headers = $this->getDefaultHeaders();
- $opts = ['headers' => $headers];
- $body = null;
+ $fullUrl  = sprintf('%s/%s', $this->getBase(), $this->getUrl());
+ $headers  = $this->getDefaultHeaders();
+ $opts  = ['headers' => $headers];
+ $body  = null;
 
  try {
  $body = json_encode($data, JSON_THROW_ON_ERROR);
@@ -347,14 +347,14 @@ protected function sendUnsignedSpectrePut(array $data): array
  try {
  $client = $this->getClient();
  $res = $client->request('PUT', $fullUrl, $opts);
- } catch (GuzzleException | RequestException $e) {
+ } catch (GuzzleException|RequestException $e) {
  // get response.
  $response = $e->getResponse();
  if (null !== $response && 406 === $response->getStatusCode()) {
  // ignore it, just log it.
- $statusCode = $response->getStatusCode();
- $responseHeaders = $response->getHeaders();
- $json = [];
+ $statusCode  = $response->getStatusCode();
+ $responseHeaders  = $response->getHeaders();
+ $json  = [];
 
  try {
  $json = json_decode((string)$e->getResponse()->getBody(), true, 512, JSON_THROW_ON_ERROR);
@@ -381,8 +381,8 @@ protected function sendUnsignedSpectrePut(array $data): array
  $body = '{}';
  }
 
- $statusCode = $res->getStatusCode();
- $responseHeaders = $res->getHeaders();
+ $statusCode  = $res->getStatusCode();
+ $responseHeaders  = $res->getHeaders();
 
  try {
  $json = json_decode($body, true, 512, JSON_THROW_ON_ERROR);

config/importer.php

@@ -23,7 +23,7 @@
 declare(strict_types=1);
 
 return [
- 'version' => 'develop/2024-04-19',
+ 'version' => 'develop/2024-04-20',
  'flows' => ['nordigen', 'spectre', 'file'],
  'flow_titles' => [
  'file' => 'File',