mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-16 09:51:16 +00:00
🤖 Auto commit for release 'develop' on 2025-09-07
This commit is contained in:
@@ -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;
|
||||
|
@@ -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.
|
||||
|
@@ -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));
|
||||
|
@@ -140,7 +140,7 @@ class UserGroupRepository implements UserGroupRepositoryInterface, UserGroupInte
|
||||
/** @var UserGroup $existingGroup */
|
||||
$existingGroup = $this->store(['user' => $user, 'title' => $groupName]);
|
||||
}
|
||||
$groupName = sprintf('%s-%s', $user->email, substr(sha1(random_int(1000, 9999) . microtime()), 0, 4));
|
||||
$groupName = sprintf('%s-%s', $user->email, substr(sha1(random_int(1000, 9999).microtime()), 0, 4));
|
||||
++$loop;
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
@@ -62,7 +62,7 @@ trait FormSupport
|
||||
}
|
||||
$name = str_replace('[]', '', $name);
|
||||
|
||||
return (string)trans('form.' . $name);
|
||||
return (string)trans('form.'.$name);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -73,7 +73,7 @@ trait FormSupport
|
||||
$options ??= [];
|
||||
$name = str_replace('[]', '', $name);
|
||||
$options['class'] = 'form-control';
|
||||
$options['id'] = 'ffInput_' . $name;
|
||||
$options['id'] = 'ffInput_'.$name;
|
||||
$options['autocomplete'] = 'off';
|
||||
$options['placeholder'] = ucfirst((string)$label);
|
||||
|
||||
|
@@ -103,7 +103,7 @@ trait ConvertsDataTypes
|
||||
{
|
||||
// assume this all works, because the validator would have caught any errors.
|
||||
$parameter = (string)request()->query->get($field);
|
||||
if('' === $parameter) {
|
||||
if ('' === $parameter) {
|
||||
return [];
|
||||
}
|
||||
$parts = explode(',', $parameter);
|
||||
|
@@ -184,11 +184,11 @@ class General extends AbstractExtension
|
||||
static function (string $string): string {
|
||||
$proto = parse_url($string, PHP_URL_SCHEME);
|
||||
$host = parse_url($string, PHP_URL_HOST);
|
||||
if(is_array($host)) {
|
||||
$host = join(' ', $host);
|
||||
if (is_array($host)) {
|
||||
$host = implode(' ', $host);
|
||||
}
|
||||
if(is_array($proto)) {
|
||||
$proto = join(' ', $proto);
|
||||
if (is_array($proto)) {
|
||||
$proto = implode(' ', $proto);
|
||||
}
|
||||
|
||||
return e(sprintf('%s://%s', $proto, $host));
|
||||
|
@@ -107,6 +107,4 @@ class PiggyBankTransformer extends AbstractTransformer
|
||||
],
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@@ -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;
|
||||
|
||||
/**
|
||||
|
@@ -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,
|
||||
|
||||
|
@@ -22,6 +22,7 @@
|
||||
|
||||
declare(strict_types=1);
|
||||
use function Safe\parse_url;
|
||||
|
||||
return [
|
||||
/*
|
||||
|--------------------------------------------------------------------------
|
||||
|
@@ -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 = [
|
||||
|
@@ -21,9 +21,10 @@
|
||||
*/
|
||||
|
||||
declare(strict_types=1);
|
||||
use function Safe\define;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
use function Safe\define;
|
||||
|
||||
/*
|
||||
* ____ ____ __ .______ ______ __ __ .___________. _______ _______.
|
||||
* \ \ / / /_ | | _ \ / __ \ | | | | | || ____| / |
|
||||
|
@@ -22,6 +22,7 @@
|
||||
declare(strict_types=1);
|
||||
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
use function Safe\define;
|
||||
|
||||
if (!defined('DATEFORMAT')) {
|
||||
|
Reference in New Issue
Block a user