diff --git a/app/Traits/DateTime.php b/app/Traits/DateTime.php index cf6d8dc8a..57d7bee71 100644 --- a/app/Traits/DateTime.php +++ b/app/Traits/DateTime.php @@ -23,9 +23,9 @@ trait DateTime $chars = ['dash' => '-', 'slash' => '/', 'dot' => '.', 'comma' => ',', 'space' => ' ']; - $date_format = (setting('localisation.date_format', $default)) ?? $default; + $date_format = setting('localisation.date_format', $default) ?? $default; - $char = (setting('localisation.date_separator', 'space')) ?? 'space'; + $char = setting('localisation.date_separator', 'space') ?? 'space'; $date_separator = $chars[$char]; return str_replace(' ', $date_separator, $date_format); diff --git a/app/Traits/Plans.php b/app/Traits/Plans.php index c6c5df4c7..02ce4d575 100644 --- a/app/Traits/Plans.php +++ b/app/Traits/Plans.php @@ -58,7 +58,7 @@ trait Plans public function getPlanLimitByType($type): object { - if (! config('app.installed') || (env_is_testing() && app()->runningInConsole())) { + if (! config('app.installed') || running_in_test()) { $limit = new \stdClass(); $limit->action_status = true;