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

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2017-09-14 17:40:02 +02:00
parent 761e9effae
commit 5e900736f8
59 changed files with 315 additions and 1912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/AccountController.php
View File

@@ -399,7 +399,7 @@ class AccountController extends Controller
$start = Navigation::startOfPeriod($start, $range);
$end = Navigation::endOfX(new Carbon, $range, null);
$entries = new Collection;
$count = 0;
// properties for cache
$cache = new CacheProperties;
$cache->addProperty($start);
@@ -412,7 +412,7 @@ class AccountController extends Controller
}
Log::debug('Going to get period expenses and incomes.');
while ($end >= $start) {
while ($end >= $start && $count < 90) {
$end = Navigation::startOfPeriod($end, $range);
$currentEnd = Navigation::endOfPeriod($end, $range);
@@ -442,7 +442,7 @@ class AccountController extends Controller
'date' => clone $end]
);
$end = Navigation::subtractPeriod($end, $range, 1);
$count++;
}
$cache->store($entries);

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

@@ -1,4 +1,15 @@
<?php
declare(strict_types=1);
/**
* ForgotPasswordController.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
* This software may be modified and distributed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International License.
*
* See the LICENSE file for details.
*/
namespace FireflyIII\Http\Controllers\Auth;

11
app/Http/Controllers/Auth/LoginController.php
View File

@@ -1,4 +1,15 @@
<?php
declare(strict_types=1);
/**
* LoginController.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
* This software may be modified and distributed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International License.
*
* See the LICENSE file for details.
*/
namespace FireflyIII\Http\Controllers\Auth;

59
app/Http/Controllers/Auth/RegisterController.php
View File

@@ -1,11 +1,22 @@
<?php
declare(strict_types=1);
/**
* RegisterController.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
* This software may be modified and distributed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International License.
*
* See the LICENSE file for details.
*/
namespace FireflyIII\Http\Controllers\Auth;
use FireflyIII\User;
use FireflyIII\Http\Controllers\Controller;
use Illuminate\Support\Facades\Validator;
use FireflyIII\User;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Validator;
class RegisterController extends Controller
{
@@ -39,31 +50,37 @@ class RegisterController extends Controller
$this->middleware('guest');
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make($data, [
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]);
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @param array $data
*
* @return \FireflyIII\User
*/
protected function create(array $data)
{
return User::create([
'email' => $data['email'],
'password' => bcrypt($data['password']),
]);
return User::create(
[
'email' => $data['email'],
'password' => bcrypt($data['password']),
]
);
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
*
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make(
$data, [
'email' => 'required|string|email|max:255|unique:users',
'password' => 'required|string|min:6|confirmed',
]
);
}
}

11
app/Http/Controllers/Auth/ResetPasswordController.php
View File

@@ -1,4 +1,15 @@
<?php
declare(strict_types=1);
/**
* ResetPasswordController.php
* Copyright (c) 2017 thegrumpydictator@gmail.com
* This software may be modified and distributed under the terms of the
* Creative Commons Attribution-ShareAlike 4.0 International License.
*
* See the LICENSE file for details.
*/
namespace FireflyIII\Http\Controllers\Auth;

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

@@ -205,7 +205,7 @@ class CategoryController extends Controller
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setAllAssetAccounts()->setRange($start, $end)->setLimit($pageSize)->setPage($page)->withoutCategory()->withOpposingAccount()
->setTypes([TransactionType::WITHDRAWAL,TransactionType::DEPOSIT, TransactionType::TRANSFER]);
->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]);
$collector->removeFilter(InternalTransferFilter::class);
$journals = $collector->getPaginatedJournals();
$journals->setPath(route('categories.no-category'));
@@ -363,7 +363,7 @@ class CategoryController extends Controller
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setAllAssetAccounts()->setRange($end, $currentEnd)->withoutCategory()
->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL,TransactionType::DEPOSIT, TransactionType::TRANSFER]);
->withOpposingAccount()->setTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::TRANSFER]);
$collector->removeFilter(InternalTransferFilter::class);
$count = $collector->getJournals()->count();
@@ -428,6 +428,7 @@ class CategoryController extends Controller
$first = Navigation::startOfPeriod($first, $range);
$end = Navigation::endOfX(new Carbon, $range, null);
$entries = new Collection;
$count = 0;
// properties for entries with their amounts.
$cache = new CacheProperties();
@@ -439,7 +440,7 @@ class CategoryController extends Controller
if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore
}
while ($end >= $first) {
while ($end >= $first && $count < 90) {
$end = Navigation::startOfPeriod($end, $range);
$currentEnd = Navigation::endOfPeriod($end, $range);
$spent = $repository->spentInPeriod(new Collection([$category]), $accounts, $end, $currentEnd);
@@ -467,6 +468,7 @@ class CategoryController extends Controller
]
);
$end = Navigation::subtractPeriod($end, $range, 1);
$count++;
}
$cache->store($entries);

6
app/Http/Controllers/RuleController.php
View File

@@ -196,9 +196,9 @@ class RuleController extends Controller
return view(
'rules.rule.edit', compact(
'rule', 'subTitle',
'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'
)
'rule', 'subTitle',
'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups'
)
);
}

4
app/Http/Controllers/Transaction/LinkController.php
View File

@@ -94,8 +94,8 @@ class LinkController extends Controller
public function store(
JournalLinkRequest $request, LinkTypeRepositoryInterface $repository, JournalRepositoryInterface $journalRepository, TransactionJournal $journal
) {
$linkInfo = $request->getLinkInfo();
if($linkInfo['transaction_journal_id'] === 0) {
$linkInfo = $request->getLinkInfo();
if ($linkInfo['transaction_journal_id'] === 0) {
Session::flash('error', trans('firefly.invalid_link_selection'));
return redirect(route('transactions.show', [$journal->id]));

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

@@ -184,7 +184,7 @@ class SplitController extends Controller
*/
private function arrayFromInput(SplitJournalFormRequest $request): array
{
$tags = is_null($request->get('tags')) ? '' : $request->get('tags');
$tags = is_null($request->get('tags')) ? '' : $request->get('tags');
$array = [
'journal_description' => $request->get('journal_description'),
'journal_source_account_id' => $request->get('journal_source_account_id'),