kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-10 14:44:26 +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 07:56:10 +02:00
parent 602df95f3c
commit 262f1bae34
93 changed files with 804 additions and 767 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Admin/NotificationController.php
View File

@@ -70,7 +70,7 @@ class NotificationController extends Controller
}
$forcedAvailability['ntfy'] = '' !== $ntfyTopic;
$forcedAvailability['pushover'] = '' !== $pushoverAppToken && '' !== $pushoverUserToken;
$forcedAvailability['slack'] = '' !== $slackUrl;
$forcedAvailability['slack'] = '' !== $slackUrl;
return view(
'settings.notifications.index',

8
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@@ -33,8 +33,8 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\View\View;
use Safe\Exceptions\UrlException;
use function Safe\parse_url;
/**
@@ -107,12 +107,12 @@ class ForgotPasswordController extends Controller
try {
$configuredHost = parse_url((string)config('app.url'), PHP_URL_HOST);
} catch (UrlException $e) {
throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.',0, $e);
throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.', 0, $e);
}
if (!is_string( $configuredHost)) {
if (!is_string($configuredHost)) {
throw new FireflyException('Please set a valid and correct Firefly III URL in the APP_URL environment variable.');
}
$host = request()->host();
$host = request()->host();
if ($configuredHost !== $host) {
Log::error(sprintf('Host header is "%s", APP_URL is "%s".', $host, $configuredHost));

6
app/Http/Controllers/Bill/CreateController.php
View File

@@ -69,14 +69,14 @@ class CreateController extends Controller
*/
public function create(Request $request)
{
$periods = [];
$periods = [];
/** @var array $billPeriods */
$billPeriods = config('firefly.bill_periods');
$billPeriods = config('firefly.bill_periods');
foreach ($billPeriods as $current) {
$periods[$current] = (string) trans('firefly.repeat_freq_'.$current);
}
$subTitle = (string) trans('firefly.create_new_bill');
$subTitle = (string) trans('firefly.create_new_bill');
// put previous url in session if not redirect from store (not "create another").
if (true !== session('bills.create.fromStore')) {

6
app/Http/Controllers/Chart/BudgetReportController.php
View File

@@ -117,7 +117,7 @@ class BudgetReportController extends Controller
];
$amount = Steam::positive($journal['amount']);
$result[$title]['amount'] = bcadd($result[$title]['amount'], $amount);
$result[$title]['amount'] = bcadd($result[$title]['amount'], $amount);
}
}
}
@@ -147,7 +147,7 @@ class BudgetReportController extends Controller
];
$amount = Steam::positive($journal['amount']);
$result[$title]['amount'] = bcadd($result[$title]['amount'], $amount);
$result[$title]['amount'] = bcadd($result[$title]['amount'], $amount);
}
}
}
@@ -235,7 +235,7 @@ class BudgetReportController extends Controller
];
$amount = Steam::positive($journal['amount']);
$result[$title]['amount'] = bcadd($result[$title]['amount'], $amount);
$result[$title]['amount'] = bcadd($result[$title]['amount'], $amount);
}
}
}

4
app/Http/Controllers/Controller.php
View File

@@ -95,8 +95,8 @@ abstract class Controller extends BaseController
View::share('logoutUrl', $logoutUrl);
// upload size
$maxFileSize = Steam::phpBytes( ini_get('upload_max_filesize'));
$maxPostSize = Steam::phpBytes( ini_get('post_max_size'));
$maxFileSize = Steam::phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = Steam::phpBytes(ini_get('post_max_size'));
$uploadSize = min($maxFileSize, $maxPostSize);
View::share('uploadSize', $uploadSize);

8
app/Http/Controllers/DebugController.php
View File

@@ -175,8 +175,8 @@ class DebugController extends Controller
private function getSystemInformation(): array
{
$maxFileSize = Steam::phpBytes( ini_get('upload_max_filesize'));
$maxPostSize = Steam::phpBytes( ini_get('post_max_size'));
$maxFileSize = Steam::phpBytes(ini_get('upload_max_filesize'));
$maxPostSize = Steam::phpBytes(ini_get('post_max_size'));
$drivers = DB::availableDrivers();
$currentDriver = DB::getDriverName();
@@ -208,7 +208,7 @@ class DebugController extends Controller
try {
if (file_exists('/var/www/counter-main.txt')) {
$return['build'] = trim( file_get_contents('/var/www/counter-main.txt'));
$return['build'] = trim(file_get_contents('/var/www/counter-main.txt'));
app('log')->debug(sprintf('build is now "%s"', $return['build']));
}
} catch (Exception $e) {
@@ -218,7 +218,7 @@ class DebugController extends Controller
try {
if (file_exists('/var/www/build-date-main.txt')) {
$return['build_date'] = trim( file_get_contents('/var/www/build-date-main.txt'));
$return['build_date'] = trim(file_get_contents('/var/www/build-date-main.txt'));
}
} catch (Exception $e) {
app('log')->debug('Could not check build date, but thats ok.');

1
app/Http/Controllers/PiggyBank/ShowController.php
View File

@@ -82,6 +82,7 @@ class ShowController extends Controller
$admin = auth()->user();
$enrichment = new PiggyBankEnrichment();
$enrichment->setUser($admin);
/** @var PiggyBank $piggyBank */
$piggyBank = $enrichment->enrichSingle($piggyBank);

6
app/Http/Controllers/Recurring/CreateController.php
View File

@@ -65,8 +65,8 @@ class CreateController extends Controller
app('view')->share('title', (string) trans('firefly.recurrences'));
app('view')->share('subTitle', (string) trans('firefly.create_new_recurrence'));
$this->repository = app(RecurringRepositoryInterface::class);
$this->budgetRepos = app(BudgetRepositoryInterface::class);
$this->repository = app(RecurringRepositoryInterface::class);
$this->budgetRepos = app(BudgetRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class);
$this->billRepository = app(BillRepositoryInterface::class);
@@ -115,7 +115,7 @@ class CreateController extends Controller
return view(
'recurring.create',
compact('tomorrow', 'oldRepetitionType', 'bills', 'weekendResponses', 'preFilled', 'repetitionEnds', 'budgets')
compact('tomorrow', 'oldRepetitionType', 'bills', 'weekendResponses', 'preFilled', 'repetitionEnds', 'budgets')
);
}

5
app/Http/Controllers/Recurring/EditController.php
View File

@@ -70,8 +70,8 @@ class EditController extends Controller
app('view')->share('title', (string) trans('firefly.recurrences'));
app('view')->share('subTitle', (string) trans('firefly.recurrences'));
$this->repository = app(RecurringRepositoryInterface::class);
$this->budgetRepos = app(BudgetRepositoryInterface::class);
$this->repository = app(RecurringRepositoryInterface::class);
$this->budgetRepos = app(BudgetRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class);
$this->billRepository = app(BillRepositoryInterface::class);
@@ -100,6 +100,7 @@ class EditController extends Controller
$admin = auth()->user();
$enrichment = new RecurringEnrichment();
$enrichment->setUser($admin);
/** @var Recurrence $recurrence */
$recurrence = $enrichment->enrichSingle($recurrence);

1
app/Http/Controllers/Recurring/ShowController.php
View File

@@ -86,6 +86,7 @@ class ShowController extends Controller
$admin = auth()->user();
$enrichment = new RecurringEnrichment();
$enrichment->setUser($admin);
/** @var Recurrence $recurrence */
$recurrence = $enrichment->enrichSingle($recurrence);

1
app/Http/Controllers/Recurring/TriggerController.php
View File

@@ -60,6 +60,7 @@ class TriggerController extends Controller
}
);
}
public function trigger(Recurrence $recurrence, TriggerRecurrenceRequest $request): RedirectResponse
{
$all = $request->getAll();

2
app/Http/Controllers/Transaction/ConvertController.php
View File

@@ -338,7 +338,7 @@ class ConvertController extends Controller
'type' => $transactionType->type,
];
/** @var Transaction|null $sourceTransaction */
/** @var null|Transaction $sourceTransaction */
$sourceTransaction = $journal->transactions()->where('amount', '<', 0)->first();
$amount = $sourceTransaction->amount ?? '0';

3
app/Http/Controllers/Transaction/ShowController.php
View File

@@ -92,7 +92,7 @@ class ShowController extends Controller
$collector = app(GroupCollectorInterface::class);
$collector->setUser($admin)->setTransactionGroup($transactionGroup)->withAPIInformation();
/** @var TransactionGroup|null $selectedGroup */
/** @var null|TransactionGroup $selectedGroup */
$selectedGroup = $collector->getGroups()->first();
if (null === $selectedGroup) {
throw new NotFoundHttpException();
@@ -119,6 +119,7 @@ class ShowController extends Controller
// enrich
$enrichment = new TransactionGroupEnrichment();
$enrichment->setUser($admin);
/** @var array $selectedGroup */
$selectedGroup = $enrichment->enrichSingle($selectedGroup);

1
app/Http/Requests/PiggyBankStoreRequest.php
View File

@@ -23,7 +23,6 @@ declare(strict_types=1);
namespace FireflyIII\Http\Requests;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Account\AccountRepositoryInterface;
use FireflyIII\Rules\IsValidPositiveAmount;