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

24
app/Support/Request/ConvertsDataTypes.php
View File

@@ -24,6 +24,7 @@ declare(strict_types=1);
namespace FireflyIII\Support\Request;
use Carbon\Carbon;
use Carbon\Exceptions\InvalidFormatException;
use Exception;
use Log;
@@ -134,7 +135,7 @@ trait ConvertsDataTypes
}
/**
* @param $array
* @param mixed $array
*
* @return array|null
*/
@@ -172,15 +173,9 @@ trait ConvertsDataTypes
if ('yes' === $value) {
return true;
}
if (1 === $value) {
return true;
}
if ('1' === $value) {
return true;
}
if (true === $value) {
return true;
}
return false;
}
@@ -197,8 +192,11 @@ trait ConvertsDataTypes
$result = null;
try {
$result = $this->get($field) ? new Carbon($this->get($field)) : null;
} catch (Exception $e) {
Log::debug(sprintf('Exception when parsing date. Not interesting: %s', $e->getMessage()));
} catch (InvalidFormatException $e) {
// @ignoreException
}
if (null === $result) {
Log::debug(sprintf('Exception when parsing date "%s".', $this->get($field)));
}
return $result;
@@ -217,10 +215,14 @@ trait ConvertsDataTypes
if ('' === $string) {
return null;
}
$carbon = null;
try {
$carbon = new Carbon($string);
} catch (Exception $e) {
Log::debug(sprintf('Invalid date: %s: %s', $string, $e->getMessage()));
} catch (InvalidFormatException $e) {
// @ignoreException
}
if (null === $carbon) {
Log::debug(sprintf('Invalid date: %s', $string));
return null;
}