From 6bc772d640c18010cb4277c3b0612071c3620e16 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 14 Jul 2018 15:21:05 +0200 Subject: [PATCH] Add Facade methods for scrutinizer. --- app/Support/Facades/FireflyConfig.php | 3 +++ app/Support/FireflyConfig.php | 34 +++++++++++++-------------- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/Support/Facades/FireflyConfig.php b/app/Support/Facades/FireflyConfig.php index 98fdaf7201..01aade0d24 100644 --- a/app/Support/Facades/FireflyConfig.php +++ b/app/Support/Facades/FireflyConfig.php @@ -22,11 +22,14 @@ declare(strict_types=1); namespace FireflyIII\Support\Facades; +use FireflyIII\Models\Configuration; use Illuminate\Support\Facades\Facade; /** * @codeCoverageIgnore * Class FireflyConfig. + * @method ?Configuration get($name, $default = null) + * @method Configuration set(string $name, $value) */ class FireflyConfig extends Facade { diff --git a/app/Support/FireflyConfig.php b/app/Support/FireflyConfig.php index 0890e601ad..f3a1f688b9 100644 --- a/app/Support/FireflyConfig.php +++ b/app/Support/FireflyConfig.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Support; use Cache; +use Exception; use FireflyIII\Models\Configuration; use Log; @@ -32,30 +33,29 @@ use Log; class FireflyConfig { /** - * @param $name - * - * @return bool - * - + * @param string $name */ - public function delete($name): bool + public function delete(string $name): void { $fullName = 'ff-config-' . $name; if (Cache::has($fullName)) { Cache::forget($fullName); } - Configuration::where('name', $name)->delete(); + try { + Configuration::where('name', $name)->delete(); + } catch (Exception $e) { + Log::debug(sprintf('Could not delete config value: %s', $e->getMessage())); - return true; + } } /** - * @param $name - * @param null $default + * @param string $name + * @param null $default * * @return \FireflyIII\Models\Configuration|null */ - public function get($name, $default = null): ?Configuration + public function get(string $name, $default = null): ?Configuration { $fullName = 'ff-config-' . $name; if (Cache::has($fullName)) { @@ -78,12 +78,12 @@ class FireflyConfig } /** - * @param $name - * @param null $default + * @param string $name + * @param null $default * * @return \FireflyIII\Models\Configuration|null */ - public function getFresh($name, $default = null) + public function getFresh(string $name, $default = null): ?Configuration { $config = Configuration::where('name', $name)->first(['id', 'name', 'data']); if ($config) { @@ -99,12 +99,12 @@ class FireflyConfig } /** - * @param $name - * @param $value + * @param string $name + * @param $value * * @return Configuration */ - public function put($name, $value): Configuration + public function put(string $name, $value): Configuration { return $this->set($name, $value); }