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

Various code cleanup things.

Browse Source
This commit is contained in:
James Cole
2016-03-19 16:51:52 +01:00
parent 47d3cf1d45
commit ef6ef57e67
24 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/Exporter/BasicExporter.php
View File

@@ -23,7 +23,7 @@ class BasicExporter
{ {
/** @var ExportJob */ /** @var ExportJob */
protected $job; protected $job;
private $entries; private $entries;
/** /**
* BasicExporter constructor. * BasicExporter constructor.

8
app/Helpers/Collection/Budget.php
View File

@@ -45,7 +45,7 @@ class Budget
*/ */
public function addBudgeted(string $add) public function addBudgeted(string $add)
{ {
$add = strval(round($add, 2)); $add = strval(round($add, 2));
$this->budgeted = bcadd($this->budgeted, $add); $this->budgeted = bcadd($this->budgeted, $add);
} }
@@ -54,7 +54,7 @@ class Budget
*/ */
public function addLeft(string $add) public function addLeft(string $add)
{ {
$add = strval(round($add, 2)); $add = strval(round($add, 2));
$this->left = bcadd($this->left, $add); $this->left = bcadd($this->left, $add);
} }
@@ -63,7 +63,7 @@ class Budget
*/ */
public function addOverspent(string $add) public function addOverspent(string $add)
{ {
$add = strval(round($add, 2)); $add = strval(round($add, 2));
$this->overspent = bcadd($this->overspent, $add); $this->overspent = bcadd($this->overspent, $add);
} }
@@ -72,7 +72,7 @@ class Budget
*/ */
public function addSpent(string $add) public function addSpent(string $add)
{ {
$add = strval(round($add, 2)); $add = strval(round($add, 2));
$this->spent = bcadd($this->spent, $add); $this->spent = bcadd($this->spent, $add);
} }

2
app/Helpers/Collection/Category.php
View File

@@ -46,7 +46,7 @@ class Category
*/ */
public function addTotal(string $add) public function addTotal(string $add)
{ {
$add = strval(round($add, 2)); $add = strval(round($add, 2));
$this->total = bcadd($this->total, $add); $this->total = bcadd($this->total, $add);
} }

2
app/Helpers/Collection/Income.php
View File

@@ -57,7 +57,7 @@ class Income
*/ */
public function addToTotal(string $add) public function addToTotal(string $add)
{ {
$add = strval(round($add, 2)); $add = strval(round($add, 2));
$this->total = bcadd($this->total, $add); $this->total = bcadd($this->total, $add);
} }

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

@@ -151,7 +151,7 @@ class AccountController extends Controller
*/ */
public function index(ARI $repository, string $what) public function index(ARI $repository, string $what)
{ {
$what = $what ?? 'asset'; $what = $what ?? 'asset';
$subTitle = trans('firefly.' . $what . '_accounts'); $subTitle = trans('firefly.' . $what . '_accounts');
$subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what); $subTitleIcon = Config::get('firefly.subIconsByIdentifier.' . $what);

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

@@ -6,7 +6,6 @@ namespace FireflyIII\Http\Controllers;
use Crypt; use Crypt;
use File; use File;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Attachments\AttachmentHelperInterface;
use FireflyIII\Http\Requests\AttachmentFormRequest; use FireflyIII\Http\Requests\AttachmentFormRequest;
use FireflyIII\Models\Attachment; use FireflyIII\Models\Attachment;
use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface;
@@ -72,7 +71,7 @@ class AttachmentController extends Controller
} }
/** /**
* @param Attachment $attachment * @param Attachment $attachment
* *
* @throws FireflyException * @throws FireflyException
* *

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

@@ -38,7 +38,7 @@ class PreferencesController extends Controller
$domain = $this->getDomain(); $domain = $this->getDomain();
$secret = $google2fa->generateSecretKey(16, Auth::user()->id); $secret = $google2fa->generateSecretKey(16, Auth::user()->id);
Session::flash('two-factor-secret', $secret); Session::flash('two-factor-secret', $secret);
$image = $google2fa->getQRCodeInline('Firefly III at ' . $domain, null, $secret, 150); $image = $google2fa->getQRCodeInline('Firefly III at ' . $domain, null, $secret, 150);
return view('preferences.code', compact('image')); return view('preferences.code', compact('image'));

1
app/Http/Middleware/RedirectIfTwoFactorAuthenticated.php
View File

@@ -15,6 +15,7 @@ use Closure;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Preferences; use Preferences;
use Session; use Session;
/** /**
* Class RedirectIfTwoFactorAuthenticated * Class RedirectIfTwoFactorAuthenticated
* *

2
app/Http/Requests/TokenFormRequest.php
View File

@@ -29,7 +29,7 @@ class TokenFormRequest extends Request
{ {
$rules = [ $rules = [
'code' => 'required|2faCode', 'code' => 'required|2faCode',
]; ];
return $rules; return $rules;

2
app/Rules/Triggers/AmountExactly.php
View File

@@ -12,7 +12,6 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class AmountExactly * Class AmountExactly
@@ -60,6 +59,7 @@ final class AmountExactly extends AbstractTrigger implements TriggerInterface
if ($result === 0) { if ($result === 0) {
return true; return true;
} }
return false; return false;
} }

1
app/Rules/Triggers/AmountLess.php
View File

@@ -12,7 +12,6 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class AmountLess * Class AmountLess

1
app/Rules/Triggers/AmountMore.php
View File

@@ -12,7 +12,6 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class AmountMore * Class AmountMore

1
app/Rules/Triggers/DescriptionContains.php
View File

@@ -12,7 +12,6 @@ namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class DescriptionContains * Class DescriptionContains

2
app/Rules/Triggers/DescriptionEnds.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class DescriptionEnds * Class DescriptionEnds
@@ -70,6 +69,7 @@ final class DescriptionEnds extends AbstractTrigger implements TriggerInterface
if ($part == $search) { if ($part == $search) {
return true; return true;
} }
return false; return false;
} }
} }

2
app/Rules/Triggers/DescriptionIs.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class DescriptionIs * Class DescriptionIs
@@ -59,6 +58,7 @@ final class DescriptionIs extends AbstractTrigger implements TriggerInterface
if ($description == $search) { if ($description == $search) {
return true; return true;
} }
return false; return false;
} }
} }

2
app/Rules/Triggers/DescriptionStarts.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class DescriptionStarts * Class DescriptionStarts
@@ -61,6 +60,7 @@ final class DescriptionStarts extends AbstractTrigger implements TriggerInterfac
if ($part == $search) { if ($part == $search) {
return true; return true;
} }
return false; return false;
} }
} }

2
app/Rules/Triggers/FromAccountEnds.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class FromAccountEnds * Class FromAccountEnds
@@ -71,6 +70,7 @@ final class FromAccountEnds extends AbstractTrigger implements TriggerInterface
if ($part == $search) { if ($part == $search) {
return true; return true;
} }
return false; return false;
} }

2
app/Rules/Triggers/FromAccountIs.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class FromAccountIs * Class FromAccountIs
@@ -59,6 +58,7 @@ final class FromAccountIs extends AbstractTrigger implements TriggerInterface
if ($name == $search) { if ($name == $search) {
return true; return true;
} }
return false; return false;
} }

2
app/Rules/Triggers/FromAccountStarts.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class FromAccountStarts * Class FromAccountStarts
@@ -61,6 +60,7 @@ final class FromAccountStarts extends AbstractTrigger implements TriggerInterfac
if ($part == $search) { if ($part == $search) {
return true; return true;
} }
return false; return false;
} }
} }

2
app/Rules/Triggers/ToAccountContains.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class ToAccountContains * Class ToAccountContains
@@ -60,6 +59,7 @@ final class ToAccountContains extends AbstractTrigger implements TriggerInterfac
if (!($strpos === false)) { if (!($strpos === false)) {
return true; return true;
} }
return false; return false;
} }
} }

2
app/Rules/Triggers/ToAccountEnds.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class ToAccountEnds * Class ToAccountEnds
@@ -71,6 +70,7 @@ final class ToAccountEnds extends AbstractTrigger implements TriggerInterface
if ($part == $search) { if ($part == $search) {
return true; return true;
} }
return false; return false;
} }
} }

2
app/Rules/Triggers/ToAccountIs.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class ToAccountIs * Class ToAccountIs
@@ -59,6 +58,7 @@ final class ToAccountIs extends AbstractTrigger implements TriggerInterface
if ($toAccountName == $search) { if ($toAccountName == $search) {
return true; return true;
} }
return false; return false;
} }

2
app/Rules/Triggers/ToAccountStarts.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class ToAccountStarts * Class ToAccountStarts
@@ -61,6 +60,7 @@ final class ToAccountStarts extends AbstractTrigger implements TriggerInterface
if ($part == $search) { if ($part == $search) {
return true; return true;
} }
return false; return false;
} }

2
app/Rules/Triggers/TransactionType.php
View File

@@ -11,7 +11,6 @@ declare(strict_types = 1);
namespace FireflyIII\Rules\Triggers; namespace FireflyIII\Rules\Triggers;
use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionJournal;
use Log;
/** /**
* Class TransactionType * Class TransactionType
@@ -59,6 +58,7 @@ final class TransactionType extends AbstractTrigger implements TriggerInterface
if ($type == $search) { if ($type == $search) {
return true; return true;
} }
return false; return false;
} }
} }