kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 00:27:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix a few null pointers.

Browse Source
This commit is contained in:
James Cole
2023-12-09 20:12:34 +01:00
parent c37a877f34
commit abd123b1c8
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/Support/ParseDateString.php
View File

@@ -25,7 +25,9 @@ declare(strict_types=1);
namespace FireflyIII\Support;
use Carbon\Carbon;
use Carbon\Exceptions\InvalidFormatException;
use FireflyIII\Exceptions\FireflyException;
use Illuminate\Support\Facades\Log;
/**
* Class ParseDateString
@@ -151,8 +153,13 @@ class ParseDateString
*/
protected function parseDefaultDate(string $date): Carbon
{
$result = Carbon::createFromFormat('Y-m-d', $date);
if(false === $result) {
$result = false;
try {
$result = Carbon::createFromFormat('Y-m-d', $date);
} catch (InvalidFormatException $e) {
Log::error(sprintf('parseDefaultDate("%s") ran into an error, but dont mind: %s', $date, $e->getMessage()));
}
if (false === $result) {
$result = today(config('app.timezone'))->startOfDay();
}
return $result;