Updated get method in Settings.php to handle default values better (#562)

devajmeireles · web-flow · commit 11cb34fdfeb5 · 2025-05-08T10:53:06.000+02:00
diff --git a/src/Settings.php b/src/Settings.php
@@ -17,7 +17,13 @@ public function set(string $key, $value): void
 
     public function get(string $key, $default = null): mixed
     {
-        return $this->client->get('settings/'.$key)->json('value') ?? $default;
+        $response = $this->client->get('settings/'.$key)->json('value');
+
+        if ($response === null) {
+            return $default instanceof \Closure ? $default() : $default;
+        }
+
+        return $response;
     }
 
     public function forget(string $key): void

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,13 @@ public function set(string $key, $value): void`
`17`	`17`
`18`	`18`	`public function get(string $key, $default = null): mixed`
`19`	`19`	`{`
`20`		`- return $this->client->get('settings/'.$key)->json('value') ?? $default;`
	`20`	`+ $response = $this->client->get('settings/'.$key)->json('value');`
	`21`	`+`
	`22`	`+ if ($response === null) {`
	`23`	`+ return $default instanceof \Closure ? $default() : $default;`
	`24`	`+ }`
	`25`	`+`
	`26`	`+ return $response;`
`21`	`27`	`}`
`22`	`28`
`23`	`29`	`public function forget(string $key): void`