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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-05-24 08:50:17 +02:00
parent 3ec9753808
commit 815fd5ff6b
135 changed files with 643 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ class AttachmentController extends Controller
*
* @param Attachment $attachment
*
* @return mixed
* @return LaravelResponse
*
* @throws FireflyException
*/
@@ -211,10 +211,12 @@ class AttachmentController extends Controller
/**
* View attachment in browser.
*
* @param Request $request
* @param Attachment $attachment
*
* @return LaravelResponse
* @throws FireflyException
* @throws \Illuminate\Contracts\Container\BindingResolutionException
*/
public function view(Request $request, Attachment $attachment): LaravelResponse
{

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

@@ -51,9 +51,9 @@ abstract class Controller extends BaseController
public function __construct()
{
// is site a demo site?
$isDemoSiteConfig = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site', false,),);
$isDemoSiteConfig = app('fireflyconfig')->get('is_demo_site', config('firefly.configuration.is_demo_site', false));
$isDemoSite = $isDemoSiteConfig ? $isDemoSiteConfig->data : false;
app('view')->share('IS_DEMO_SITE', $isDemoSite,);
app('view')->share('IS_DEMO_SITE', $isDemoSite);
app('view')->share('DEMO_USERNAME', config('firefly.demo_username'));
app('view')->share('DEMO_PASSWORD', config('firefly.demo_password'));
app('view')->share('FF_VERSION', config('firefly.version'));
@@ -76,12 +76,12 @@ abstract class Controller extends BaseController
// share is alpha, is beta
$isAlpha = false;
if (false !== strpos(config('firefly.version'), 'alpha')) {
if (str_contains(config('firefly.version'), 'alpha')) {
$isAlpha = true;
}
$isBeta = false;
if (false !== strpos(config('firefly.version'), 'beta')) {
if (str_contains(config('firefly.version'), 'beta')) {
$isBeta = true;
}

9
app/Http/Controllers/CurrencyController.php
View File

@@ -32,6 +32,7 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Routing\Redirector;
use Illuminate\View\View;
use Log;
/**
@@ -67,7 +68,7 @@ class CurrencyController extends Controller
*
* @param Request $request
*
* @return Factory|RedirectResponse|Redirector|\Illuminate\View\View
* @return Factory|RedirectResponse|Redirector|View
*/
public function create(Request $request)
{
@@ -120,7 +121,7 @@ class CurrencyController extends Controller
* @param Request $request
* @param TransactionCurrency $currency
*
* @return Factory|RedirectResponse|Redirector|\Illuminate\View\View
* @return Factory|RedirectResponse|Redirector|View
*/
public function delete(Request $request, TransactionCurrency $currency)
{
@@ -258,7 +259,7 @@ class CurrencyController extends Controller
* @param Request $request
* @param TransactionCurrency $currency
*
* @return Factory|RedirectResponse|Redirector|\Illuminate\View\View
* @return Factory|RedirectResponse|Redirector|View
*/
public function edit(Request $request, TransactionCurrency $currency)
{
@@ -316,7 +317,7 @@ class CurrencyController extends Controller
*
* @param Request $request
*
* @return Factory|\Illuminate\View\View
* @return Factory|View
*/
public function index(Request $request)
{

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

@@ -116,7 +116,7 @@ class DebugController extends Controller
* @param Request $request
*
* @return Factory|View
*
* @throws FireflyException
*/
public function index(Request $request)
{