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

Some code cleanup things courtesy of SensioLabs.

Browse Source
This commit is contained in:
James Cole
2016-01-28 21:33:45 +01:00
parent 167c057e8a
commit e5b4a55d8e
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -3,7 +3,6 @@
Homestead.yaml Homestead.yaml
Homestead.json Homestead.json
.env .env
.idea/
_ide_helper.php _ide_helper.php
_ide_helper_models.php _ide_helper_models.php
.phpstorm.meta.php .phpstorm.meta.php

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

@@ -17,6 +17,7 @@ use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\RuleTrigger; use FireflyIII\Models\RuleTrigger;
use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Input; use Input;
use Preferences; use Preferences;
use Response; use Response;
@@ -177,22 +178,21 @@ class RuleController extends Controller
$this->createDefaultRuleGroup(); $this->createDefaultRuleGroup();
$this->createDefaultRule(); $this->createDefaultRule();
$ruleGroups = Auth::user() $ruleGroups = Auth::user()
->ruleGroups() ->ruleGroups()
->orderBy('active', 'DESC') ->orderBy('active', 'DESC')
->orderBy('order', 'ASC') ->orderBy('order', 'ASC')
->with( ->with(
[ [
'rules' => function ($query) { 'rules' => function (HasMany $query) {
$query->orderBy('active', 'DESC'); $query->orderBy('active', 'DESC');
$query->orderBy('order', 'ASC'); $query->orderBy('order', 'ASC');
}, },
'rules.ruleTriggers' => function ($query) { 'rules.ruleTriggers' => function (HasMany $query) {
$query->orderBy('order', 'ASC'); $query->orderBy('order', 'ASC');
}, },
'rules.ruleActions' => function ($query) { 'rules.ruleActions' => function (HasMany $query) {
$query->orderBy('order', 'ASC'); $query->orderBy('order', 'ASC');
}, },
] ]

4
app/Http/Middleware/Authenticate.php
View File

@@ -4,7 +4,7 @@ namespace FireflyIII\Http\Middleware;
use Closure; use Closure;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request;
/** /**
* Class Authenticate * Class Authenticate
* *
@@ -21,7 +21,7 @@ class Authenticate
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next, $guard = null) public function handle(Request $request, Closure $next, $guard = null)
{ {
if (Auth::guard($guard)->guest()) { if (Auth::guard($guard)->guest()) {
if ($request->ajax()) { if ($request->ajax()) {

4
app/Http/Middleware/Binder.php
View File

@@ -4,6 +4,8 @@ namespace FireflyIII\Http\Middleware;
use Closure; use Closure;
use FireflyIII\Support\Domain; use FireflyIII\Support\Domain;
use Illuminate\Http\Request;
/** /**
* Class Binder * Class Binder
@@ -30,7 +32,7 @@ class Binder
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request, Closure $next)
{ {
foreach ($request->route()->parameters() as $key => $value) { foreach ($request->route()->parameters() as $key => $value) {
if (isset($this->binders[$key])) { if (isset($this->binders[$key])) {

3
app/Http/Middleware/Range.php
View File

@@ -6,6 +6,7 @@ namespace FireflyIII\Http\Middleware;
use Carbon\Carbon; use Carbon\Carbon;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Navigation; use Navigation;
use Preferences; use Preferences;
@@ -48,7 +49,7 @@ class Range
* @return mixed * @return mixed
* @internal param Closure $next * @internal param Closure $next
*/ */
public function handle($request, Closure $theNext, $guard = null) public function handle(Request $request, Closure $theNext, $guard = null)
{ {
if (!Auth::guard($guard)->guest()) { if (!Auth::guard($guard)->guest()) {
// ignore preference. set the range to be the current month: // ignore preference. set the range to be the current month: