🤖 Auto commit for release 'develop' on 2025-08-16

This commit is contained in:
JC5
2025-08-16 19:36:45 +02:00
parent eccc58e75a
commit 3409240a19
22 changed files with 96 additions and 73 deletions

View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\DateRequest;
use FireflyIII\Api\V1\Requests\Data\SameDateRequest;
use FireflyIII\Enums\UserRoleEnum;
use FireflyIII\Exceptions\FireflyException;

View File

@@ -26,7 +26,6 @@ namespace FireflyIII\Api\V1\Controllers\Chart;
use Carbon\Carbon;
use FireflyIII\Api\V1\Controllers\Controller;
use FireflyIII\Api\V1\Requests\Data\DateRequest;
use FireflyIII\Api\V1\Requests\Data\SameDateRequest;
use FireflyIII\Enums\AccountTypeEnum;
use FireflyIII\Enums\TransactionTypeEnum;

View File

@@ -46,6 +46,7 @@ use Illuminate\Http\JsonResponse;
class PurgeController extends Controller
{
protected array $acceptedRoles = [UserRoleEnum::FULL];
public function __construct()
{
parent::__construct();

View File

@@ -86,6 +86,7 @@ class ValidatesEnvironmentVariables extends Command
return false;
}
return true;
}
@@ -96,8 +97,10 @@ class ValidatesEnvironmentVariables extends Command
$this->friendlyError(sprintf('AUTHENTICATION_GUARD "%s" is not a valid guard for Firefly III.', $guard));
$this->friendlyError('Please check your .env file and make sure you use a valid setting.');
$this->friendlyError('Valid guards are: web, remote_user_guard');
return false;
}
return true;
}
@@ -107,8 +110,10 @@ class ValidatesEnvironmentVariables extends Command
if ('' !== $token && 32 !== strlen($token)) {
$this->friendlyError('STATIC_CRON_TOKEN must be empty or a 32-character string.');
$this->friendlyError('Please check your .env file and make sure you use a valid setting.');
return false;
}
return true;
}
}

View File

@@ -34,6 +34,7 @@ use Illuminate\Support\Facades\Storage;
use Safe\Exceptions\FileinfoException;
use Safe\Exceptions\FilesystemException;
use Safe\Exceptions\StringsException;
use function Safe\file_put_contents;
use function Safe\md5_file;
use function Safe\mime_content_type;
@@ -49,6 +50,7 @@ class ScansAttachments extends Command
/**
* Execute the console command.
*
* @throws FilesystemException
* @throws StringsException
* @throws FileinfoException

View File

@@ -835,8 +835,10 @@ class GroupCollector implements GroupCollectorInterface
if (count($product['transactions']) > 1) {
return $product['title'];
}
return 'zzz';
}
return 'zzz';
});
}

View File

@@ -168,6 +168,7 @@ class FrontpageChartGenerator
];
}
}
return $tempData;
}
}

14
composer.lock generated
View File

@@ -11771,16 +11771,16 @@
},
{
"name": "phpunit/phpunit",
"version": "12.3.4",
"version": "12.3.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "429095031bd38cb5070ca44166bd9dd5a9245dd6"
"reference": "f10ba5f12a256026ad3c7ee4894ffe47f60d7dc7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/429095031bd38cb5070ca44166bd9dd5a9245dd6",
"reference": "429095031bd38cb5070ca44166bd9dd5a9245dd6",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f10ba5f12a256026ad3c7ee4894ffe47f60d7dc7",
"reference": "f10ba5f12a256026ad3c7ee4894ffe47f60d7dc7",
"shasum": ""
},
"require": {
@@ -11802,7 +11802,7 @@
"sebastian/cli-parser": "^4.0.0",
"sebastian/comparator": "^7.1.2",
"sebastian/diff": "^7.0.0",
"sebastian/environment": "^8.0.2",
"sebastian/environment": "^8.0.3",
"sebastian/exporter": "^7.0.0",
"sebastian/global-state": "^8.0.0",
"sebastian/object-enumerator": "^7.0.0",
@@ -11848,7 +11848,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.4"
"source": "https://github.com/sebastianbergmann/phpunit/tree/12.3.5"
},
"funding": [
{
@@ -11872,7 +11872,7 @@
"type": "tidelift"
}
],
"time": "2025-08-12T07:35:30+00:00"
"time": "2025-08-16T05:20:09+00:00"
},
{
"name": "rector/rector",

View File

@@ -79,7 +79,7 @@ return [
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2025-08-16',
'build_time' => 1755317476,
'build_time' => 1755365689,
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 26,

View File

@@ -28,8 +28,6 @@ use FireflyIII\Models\Bill;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\integration\TestCase;
use FireflyIII\User;
use FireflyIII\Models\UserGroup;
use Override;
/**
* Class BillControllerTest
@@ -45,7 +43,6 @@ final class BillControllerTest extends TestCase
*/
use RefreshDatabase;
private function createTestBills(int $count, User $user): void
{
for ($i = 1; $i <= $count; ++$i) {

View File

@@ -25,11 +25,9 @@ declare(strict_types=1);
namespace Tests\integration\Api\Autocomplete;
use FireflyIII\Models\Budget;
use FireflyIII\Models\UserGroup;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\integration\TestCase;
use FireflyIII\User;
use Override;
/**
* Class BudgetControllerTest

View File

@@ -25,13 +25,9 @@ declare(strict_types=1);
namespace Tests\integration\Api\Autocomplete;
use FireflyIII\Models\Category;
use FireflyIII\Models\UserRole;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\DB;
use Tests\integration\TestCase;
use FireflyIII\User;
use FireflyIII\Models\UserGroup;
use Override;
/**
* Class CategoryControllerTest
@@ -47,8 +43,6 @@ final class CategoryControllerTest extends TestCase
*/
use RefreshDatabase;
private function createTestCategories(int $count, User $user): void
{
for ($i = 1; $i <= $count; ++$i) {

View File

@@ -28,8 +28,6 @@ use FireflyIII\Models\TransactionCurrency;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\integration\TestCase;
use FireflyIII\User;
use FireflyIII\Models\UserGroup;
use Override;
/**
* Class CurrencyControllerTest
@@ -45,7 +43,6 @@ final class CurrencyControllerTest extends TestCase
*/
use RefreshDatabase;
private function createTestCurrencies(int $count, bool $enabled): void
{
for ($i = 1; $i <= $count; ++$i) {

View File

@@ -28,8 +28,6 @@ use FireflyIII\Models\ObjectGroup;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\integration\TestCase;
use FireflyIII\User;
use FireflyIII\Models\UserGroup;
use Override;
/**
* Class ObjectGroupControllerTest

View File

@@ -1,11 +1,18 @@
<?php
declare(strict_types=1);
namespace Tests\integration\Api\Chart;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\integration\TestCase;
class AccountControllerTest extends TestCase
/**
* @internal
*
* @coversNothing
*/
final class AccountControllerTest extends TestCase
{
use RefreshDatabase;
private $user;
@@ -28,6 +35,7 @@ class AccountControllerTest extends TestCase
$response->assertStatus(422);
}
public function testGetOverviewChart(): void
{
$this->actingAs($this->user);

View File

@@ -1,11 +1,18 @@
<?php
declare(strict_types=1);
namespace Tests\integration\Api\Chart;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\integration\TestCase;
class BalanceControllerTest extends TestCase
/**
* @internal
*
* @coversNothing
*/
final class BalanceControllerTest extends TestCase
{
use RefreshDatabase;
private $user;
@@ -28,6 +35,7 @@ class BalanceControllerTest extends TestCase
$response->assertStatus(422);
}
public function testGetOverviewChart(): void
{
$this->actingAs($this->user);

View File

@@ -1,11 +1,18 @@
<?php
declare(strict_types=1);
namespace Tests\integration\Api\Chart;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\integration\TestCase;
class BudgetControllerTest extends TestCase
/**
* @internal
*
* @coversNothing
*/
final class BudgetControllerTest extends TestCase
{
use RefreshDatabase;
private $user;
@@ -28,6 +35,7 @@ class BudgetControllerTest extends TestCase
$response->assertStatus(422);
}
public function testGetOverviewChart(): void
{
$this->actingAs($this->user);

View File

@@ -1,11 +1,18 @@
<?php
declare(strict_types=1);
namespace Tests\integration\Api\Chart;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\integration\TestCase;
class CategoryControllerTest extends TestCase
/**
* @internal
*
* @coversNothing
*/
final class CategoryControllerTest extends TestCase
{
use RefreshDatabase;
private $user;
@@ -28,6 +35,7 @@ class CategoryControllerTest extends TestCase
$response->assertStatus(422);
}
public function testGetOverviewChart(): void
{
$this->actingAs($this->user);

View File

@@ -82,6 +82,4 @@ abstract class TestCase extends BaseTestCase
return $user;
}
}