kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-16 09:51:16 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-09-07

Browse Source
This commit is contained in:
JC5
2025-09-07 11:04:11 +02:00
parent f88286c848
commit 12e8651017
17 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Api/V1/Controllers/Controller.php
View File

@@ -27,7 +27,6 @@ namespace FireflyIII\Api\V1\Controllers;
use Carbon\Carbon;
use Carbon\Exceptions\InvalidFormatException;
use FireflyIII\Exceptions\BadHttpHeaderException;
use FireflyIII\Models\Preference;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Support\Facades\Amount;
use FireflyIII\Support\Facades\Steam;

2
app/Handlers/Events/UserEventHandler.php
View File

@@ -129,7 +129,7 @@ class UserEventHandler
$groupTitle = $user->email;
$index = 1;
/** @var UserGroup|null $group */
/** @var null|UserGroup $group */
$group = null;
// create a new group.

2
app/Http/Controllers/ProfileController.php
View File

@@ -412,7 +412,7 @@ class ProfileController extends Controller
// found user.which email address to return to?
$set = app('preferences')->beginsWith($user, 'previous_email_');
/** @var string|null $match */
/** @var null|string $match */
$match = null;
foreach ($set as $entry) {
$hashed = hash('sha256', sprintf('%s%s', (string) config('app.key'), $entry->data));

3
app/Repositories/UserGroup/UserGroupRepository.php
View File

@@ -264,7 +264,8 @@ class UserGroupRepository implements UserGroupRepositoryInterface, UserGroupInte
// group has multiple members. How many are owner, except the user we're editing now?
$ownerCount = $userGroup->groupMemberships()
->where('user_role_id', $owner->id)
->where('user_id', '!=', $user->id)->count();
->where('user_id', '!=', $user->id)->count()
;
// if there are no other owners and the current users does not get or keep the owner role, refuse.
if (
0 === $ownerCount

4
app/Support/Twig/General.php
View File

@@ -185,10 +185,10 @@ class General extends AbstractExtension
$proto = parse_url($string, PHP_URL_SCHEME);
$host = parse_url($string, PHP_URL_HOST);
if (is_array($host)) {
$host = join(' ', $host);
$host = implode(' ', $host);
}
if (is_array($proto)) {
$proto = join(' ', $proto);
$proto = implode(' ', $proto);
}
return e(sprintf('%s://%s', $proto, $host));

2
app/Transformers/PiggyBankTransformer.php
View File

@@ -107,6 +107,4 @@ class PiggyBankTransformer extends AbstractTransformer
],
];
}
}

3
app/Transformers/WebhookTransformer.php
View File

@@ -24,9 +24,6 @@ declare(strict_types=1);
namespace FireflyIII\Transformers;
use FireflyIII\Enums\WebhookDelivery;
use FireflyIII\Enums\WebhookResponse;
use FireflyIII\Enums\WebhookTrigger;
use FireflyIII\Models\Webhook;
/**

2
config/firefly.php
View File

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

1
config/mail.php
View File

@@ -22,6 +22,7 @@
declare(strict_types=1);
use function Safe\parse_url;
return [
/*
|--------------------------------------------------------------------------

1
config/view.php
View File

@@ -22,6 +22,7 @@
declare(strict_types=1);
use function Safe\realpath;
$paths = [realpath(base_path('resources/views'))];
if ('v2' === env('FIREFLY_III_LAYOUT')) {
$paths = [

3
routes/api.php
View File

@@ -21,9 +21,10 @@
*/
declare(strict_types=1);
use function Safe\define;
use Illuminate\Support\Facades\Route;
use function Safe\define;
/*
* ____ ____ __ .______ ______ __ __ .___________. _______ _______.
* \ \ / / /_ | | _ \ / __ \ | | | | | || ____| / |

1
routes/web.php
View File

@@ -22,6 +22,7 @@
declare(strict_types=1);
use Illuminate\Support\Facades\Route;
use function Safe\define;
if (!defined('DATEFORMAT')) {