IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages 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

51
app/Models/Tag.php
View File

@@ -59,38 +59,6 @@ class Tag extends Model
/** @var array */
protected $fillable = ['user_id', 'tag', 'date', 'description', 'longitude', 'latitude', 'zoomLevel', 'tagMode'];
/**
* @param array $fields
*
* @deprecated
* @return Tag|null
*/
public static function firstOrCreateEncrypted(array $fields)
{
// everything but the tag:
unset($fields['tagMode']);
$search = $fields;
unset($search['tag']);
$query = self::orderBy('id');
foreach ($search as $name => $value) {
$query->where($name, $value);
}
$set = $query->get(['tags.*']);
/** @var Tag $tag */
foreach ($set as $tag) {
if ($tag->tag === $fields['tag']) {
return $tag;
}
}
// create it!
$fields['tagMode'] = 'nothing';
$fields['description'] = $fields['description'] ?? '';
$tag = self::create($fields);
return $tag;
}
/**
* @param string $value
*
@@ -101,7 +69,10 @@ class Tag extends Model
{
if (auth()->check()) {
$tagId = (int)$value;
$tag = auth()->user()->tags()->find($tagId);
/** @var User $user */
$user = auth()->user();
/** @var Tag $tag */
$tag = $user->tags()->find($tagId);
if (null !== $tag) {
return $tag;
}
@@ -117,7 +88,7 @@ class Tag extends Model
* @return string
* @throws \Illuminate\Contracts\Encryption\DecryptException
*/
public function getDescriptionAttribute($value)
public function getDescriptionAttribute($value): string
{
if (null === $value) {
return $value;
@@ -131,10 +102,10 @@ class Tag extends Model
*
* @param $value
*
* @return string
* @return string|null
* @throws \Illuminate\Contracts\Encryption\DecryptException
*/
public function getTagAttribute($value)
public function getTagAttribute($value): ?string
{
if (null === $value) {
return null;
@@ -150,7 +121,7 @@ class Tag extends Model
*
* @throws \Illuminate\Contracts\Encryption\EncryptException
*/
public function setDescriptionAttribute($value)
public function setDescriptionAttribute($value): void
{
$this->attributes['description'] = Crypt::encrypt($value);
}
@@ -162,7 +133,7 @@ class Tag extends Model
*
* @throws \Illuminate\Contracts\Encryption\EncryptException
*/
public function setTagAttribute($value)
public function setTagAttribute($value): void
{
$this->attributes['tag'] = Crypt::encrypt($value);
}
@@ -171,7 +142,7 @@ class Tag 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);
}
@@ -180,7 +151,7 @@ class Tag extends Model
* @codeCoverageIgnore
* @return \Illuminate\Database\Eloquent\Relations\BelongsTo
*/
public function user()
public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo
{
return $this->belongsTo(User::class);
}