kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-06 22:21:42 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-04-06 17:00:16 +02:00
parent 8572280b7b
commit 38d0f0427f
61 changed files with 419 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Support/Preferences.php
View File

@@ -24,6 +24,7 @@ namespace FireflyIII\Support;
use Cache;
use Exception;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Preference;
use FireflyIII\User;
use Illuminate\Support\Collection;
@@ -49,9 +50,10 @@ class Preferences
}
/**
* @param $name
* @param string $name
*
* @return bool
* @throws FireflyException
*/
public function delete(string $name): bool
{
@@ -62,8 +64,7 @@ class Preferences
try {
Preference::where('user_id', auth()->user()->id)->where('name', $name)->delete();
} catch (Exception $e) {
Log::debug(sprintf('Could not delete preference: %s', $e->getMessage()));
// don't care.
throw new FireflyException(sprintf('Could not delete preference: %s', $e->getMessage()), 0, $e);
}
return true;
@@ -87,7 +88,7 @@ class Preferences
*/
public function get(string $name, $default = null): ?Preference
{
/** @var User $user */
/** @var User|null $user */
$user = auth()->user();
if (null === $user) {
$preference = new Preference;
@@ -107,7 +108,7 @@ class Preferences
*/
public function getFresh(string $name, $default = null): ?Preference
{
/** @var User $user */
/** @var User|null $user */
$user = auth()->user();
if (null === $user) {
$preference = new Preference;
@@ -134,7 +135,7 @@ class Preferences
$result[$preference->name] = $preference->data;
}
foreach ($list as $name) {
if (!isset($result[$name])) {
if (!array_key_exists($name, $result)) {
$result[$name] = null;
}
}
@@ -148,6 +149,7 @@ class Preferences
* @param null|string|int $default
*
* @return \FireflyIII\Models\Preference|null
* @throws FireflyException
*/
public function getForUser(User $user, string $name, $default = null): ?Preference
{
@@ -156,7 +158,7 @@ class Preferences
try {
$preference->delete();
} catch (Exception $e) {
Log::debug(sprintf('Could not delete preference #%d: %s', $preference->id, $e->getMessage()));
throw new FireflyException(sprintf('Could not delete preference #%d: %s', $preference->id, $e->getMessage()), 0, $e);
}
$preference = null;
}
@@ -252,6 +254,7 @@ class Preferences
* @param mixed $value
*
* @return Preference
* @throws FireflyException
*/
public function setForUser(User $user, string $name, $value): Preference
{
@@ -264,7 +267,7 @@ class Preferences
try {
$pref->delete();
} catch (Exception $e) {
Log::error(sprintf('Could not delete preference: %s', $e->getMessage()));
throw new FireflyException(sprintf('Could not delete preference: %s', $e->getMessage()), 0, $e);
}
return new Preference;
@@ -272,20 +275,7 @@ class Preferences
if (null === $value) {
return new Preference;
}
if (null !== $pref) {
$pref->data = $value;
$pref->save();
Cache::forever($fullName, $pref);
return $pref;
}
$pref = new Preference;
$pref->name = $name;
$pref->data = $value;
$pref->user()->associate($user);
$pref->save();
Cache::forever($fullName, $pref);