kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 08:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Clean up code, remove unused methods.

Browse Source
This commit is contained in:
James Cole
2018-07-22 16:35:46 +02:00
parent dbbf0ff5e4
commit a722dc4235
43 changed files with 210 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/Models/Category.php
View File

@@ -36,6 +36,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
* @property int $id
* @property float $spent // used in category reports
* @property Carbon|null lastActivity
* @property bool encrypted
*/
class Category extends Model
{
@@ -58,34 +59,6 @@ class Category extends Model
/** @var array */
protected $hidden = ['encrypted'];
/**
* @param array $fields
*
* @deprecated
* @return Category
*/
public static function firstOrCreateEncrypted(array $fields)
{
// everything but the name:
$query = self::orderBy('id');
$search = $fields;
unset($search['name']);
foreach ($search as $name => $value) {
$query->where($name, $value);
}
$set = $query->get(['categories.*']);
/** @var Category $category */
foreach ($set as $category) {
if ($category->name === $fields['name']) {
return $category;
}
}
// create it!
$category = self::create($fields);
return $category;
}
/**
* @param string $value
*
@@ -96,7 +69,10 @@ class Category extends Model
{
if (auth()->check()) {
$categoryId = (int)$value;
$category = auth()->user()->categories()->find($categoryId);
/** @var User $user */
$user = auth()->user();
/** @var Category $category */
$category = $user->categories()->find($categoryId);
if (null !== $category) {
return $category;
}
@@ -112,7 +88,7 @@ class Category extends Model
* @return string
* @throws \Illuminate\Contracts\Encryption\DecryptException
*/
public function getNameAttribute($value)
public function getNameAttribute($value): string
{
if ($this->encrypted) {
return Crypt::decrypt($value);
@@ -128,7 +104,7 @@ class Category extends Model
*
* @throws \Illuminate\Contracts\Encryption\EncryptException
*/
public function setNameAttribute($value)
public function setNameAttribute($value): void
{
$encrypt = config('firefly.encryption');
$this->attributes['name'] = $encrypt ? Crypt::encrypt($value) : $value;
@@ -139,7 +115,7 @@ class Category extends Model
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function transactionJournals()
public function transactionJournals(): \Illuminate\Database\Eloquent\Relations\BelongsToMany
{
return $this->belongsToMany(TransactionJournal::class, 'category_transaction_journal', 'category_id');
}
@@ -148,7 +124,7 @@ class Category extends Model
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function transactions()
public function transactions(): \Illuminate\Database\Eloquent\Relations\BelongsToMany
{
return $this->belongsToMany(Transaction::class, 'category_transaction', 'category_id');
}