Merge pull request #909 from firefly-iii/develop

🤖 Automatically merge the PR into the main branch.

Author: github-actions[bot]

.ci/php-cs-fixer/.php-cs-fixer.php

@@ -33,6 +33,7 @@
 
 
 $config = (new PhpCsFixer\Config())
+     // ->setUnsupportedPhpVersionAllowed(true) // use this when PHP 8.5 comes out.
         ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
         ;
 return $config->setRules(

.ci/phpcs.sh

@@ -26,7 +26,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 cd $SCRIPT_DIR/php-cs-fixer
 composer update --quiet
 rm -f .php-cs-fixer.cache
-PHP_CS_FIXER_IGNORE_ENV=true ./vendor/bin/php-cs-fixer fix \
+./vendor/bin/php-cs-fixer fix \
     --config $SCRIPT_DIR/php-cs-fixer/.php-cs-fixer.php \
     --format=txt \
     -v \

.github/workflows/sonarcloud.yml

@@ -4,6 +4,7 @@ Over time, many people have contributed to the Firefly III Data Importer. Their
 Please find below all the people who contributed to the Firefly III Data Importer code. Their names are mentioned in the year of their first contribution.
 
 ## 2025
+- DrEthan
 - Tamás Varga
 - Odd Stråbø
 - George Garside

THANKS.md

@@ -661,13 +661,9 @@ private function importUpload(string $jsonFile, string $importableFile): void
 
     protected function isNothingDownloaded(): bool
     {
-        /** @var array $errors */
         foreach ($this->conversionErrors as $errors) {
-            /** @var string $error */
-            foreach ($errors as $error) {
-                if (str_contains($error, '[a111]')) {
-                    return true;
-                }
+            if (array_any($errors, fn ($error) => str_contains($error, '[a111]'))) {
+                return true;
             }
         }
 
@@ -676,13 +672,9 @@ protected function isNothingDownloaded(): bool
 
     protected function isExpiredAgreement(): bool
     {
-        /** @var array $errors */
         foreach ($this->conversionErrors as $errors) {
-            /** @var string $error */
-            foreach ($errors as $error) {
-                if (str_contains($error, 'EUA') && str_contains($error, 'expired')) {
-                    return true;
-                }
+            if (array_any($errors, fn ($error) => str_contains($error, 'EUA') && str_contains($error, 'expired'))) {
+                return true;
             }
         }
 

app/Console/AutoImports.php

@@ -27,6 +27,8 @@
 
 use Illuminate\Console\Command;
 
+use const PHP_SAPI;
+
 /**
  * Class ShowVersion
  */
@@ -41,7 +43,7 @@ final class ShowVersion extends Command
     public function handle(): int
     {
         $this->line(sprintf('Firefly III data importer v%s', config('importer.version')));
-        $this->line(sprintf('PHP: %s %s %s', \PHP_SAPI, PHP_VERSION, PHP_OS));
+        $this->line(sprintf('PHP: %s %s %s', PHP_SAPI, PHP_VERSION, PHP_OS));
 
         return 0;
     }

app/Console/Commands/ShowVersion.php

@@ -34,6 +34,8 @@
 use Monolog\Logger;
 use Exception;
 
+use const PHP_SAPI;
+
 class DebugController extends Controller
 {
     /**
@@ -127,7 +129,7 @@ private function getSystemInfo(): array
             'base_build'  => $baseBuild,
             'php_version' => str_replace($search, $replace, PHP_VERSION),
             'php_os'      => str_replace($search, $replace, PHP_OS),
-            'interface'   => \PHP_SAPI,
+            'interface'   => PHP_SAPI,
         ];
     }
 
@@ -156,7 +158,7 @@ protected function errorReporting(int $value): string // get configuration
             E_COMPILE_ERROR | E_RECOVERABLE_ERROR | E_ERROR | E_CORE_ERROR => 'E_COMPILE_ERROR|E_RECOVERABLE_ERROR|E_ERROR|E_CORE_ERROR',
         ];
 
-        return $array[$value] ?? sprintf('flags: %s', (string)$value);
+        return $array[$value] ?? sprintf('flags: %s', $value);
     }
 
     private function getUserInfo(): array

app/Http/Controllers/DebugController.php

@@ -366,13 +366,9 @@ public function postIndex(ConfigurationPostRequest $request): RedirectResponse
             }
 
         }
-
         $configuration->updateDateRange();
-
         // Map data option is now user-selectable for SimpleFIN via checkbox
 
-        $json                = '{}';
-
         try {
             $json = json_encode($configuration->toArray(), JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT);
         } catch (JsonException $e) {

app/Http/Controllers/Import/ConfigurationController.php

@@ -56,7 +56,7 @@ class ConversionController extends Controller
 {
     use RestoresConfiguration;
 
-    protected const DISK_NAME = 'jobs'; // TODO stored in several places
+    protected const string DISK_NAME = 'jobs'; // TODO stored in several places
 
     /**
      * StartController constructor.
@@ -119,7 +119,7 @@ public function index(): Application|Factory|View
             throw new ImporterErrorException(sprintf('Not a supported flow: "%s"', $flow));
         }
 
-        /** @var RoutineManagerInterface $routine */
+        /** @var null|RoutineManagerInterface $routine */
         if ('file' === $flow) {
             $contentType = $configuration->getContentType();
             if ('unknown' === $contentType || 'csv' === $contentType) {
@@ -250,7 +250,7 @@ public function start(Request $request): JsonResponse
             throw new ImporterErrorException(sprintf('Not a supported flow: "%s"', $flow));
         }
 
-        /** @var RoutineManagerInterface $routine */
+        /** @var null|RoutineManagerInterface $routine */
         if ('file' === $flow) {
             $contentType = $configuration->getContentType();
             if ('unknown' === $contentType || 'csv' === $contentType) {

app/Http/Controllers/Import/ConversionController.php

@@ -212,14 +212,10 @@ private function camtIndex(Request $request, Configuration $configuration): View
     private function getFieldsForLevel(string $level): array
     {
         $allFields = config('camt.fields');
-        $return    = [];
-        foreach ($allFields as $title => $field) {
-            if ($level === $field['level']) {
-                $return[$title] = $field;
-            }
-        }
 
-        return $return;
+        return array_filter($allFields, function ($field) use ($level) {
+            return $level === $field['level'];
+        });
     }
 
     public function postIndex(RolesPostRequest $request): RedirectResponse