adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-13 02:32:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated to laravel 11

Browse Source
This commit is contained in:
Constantin Graf
2024-03-27 15:00:00 +01:00
parent 5d256650d2
commit ebd4754773
22 changed files with 1585 additions and 847 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Service/DashboardService.php
View File

@@ -62,7 +62,7 @@ class DashboardService
{
$value1 = Carbon::createFromFormat('Y-m-d', $possibleDates->first(), $timeZone);
$value2 = Carbon::createFromFormat('Y-m-d', $possibleDates->last(), $timeZone);
if ($value2 === false || $value1 === false) {
if ($value2 === null || $value1 === null) {
throw new \RuntimeException('Provided date is not valid');
}
if ($value1->gt($value2)) {

4
app/Service/Import/Importers/ClockifyTimeEntriesImporter.php
View File

@@ -102,7 +102,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
} else {
$start = Carbon::createFromFormat('m/d/Y H:i:s A', $record['Start Date'].' '.$record['Start Time'], 'UTC');
}
if ($start === false) {
if ($start === null) {
throw new ImportException('Start date ("'.$record['Start Date'].'") or time ("'.$record['Start Time'].'") are invalid');
}
$timeEntry->start = $start;
@@ -113,7 +113,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
} else {
$end = Carbon::createFromFormat('m/d/Y H:i:s A', $record['End Date'].' '.$record['End Time'], 'UTC');
}
if ($end === false) {
if ($end === null) {
throw new ImportException('End date ("'.$record['End Date'].'") or time ("'.$record['End Time'].'") are invalid');
}
$timeEntry->end = $end;

4
app/Service/Import/Importers/TogglTimeEntriesImporter.php
View File

@@ -93,12 +93,12 @@ class TogglTimeEntriesImporter extends DefaultImporter
$timeEntry->billable = $record['Billable'] === 'Yes';
$timeEntry->tags = $this->getTags($record['Tags']);
$start = Carbon::createFromFormat('Y-m-d H:i:s', $record['Start date'].' '.$record['Start time'], 'UTC');
if ($start === false) {
if ($start === null) {
throw new ImportException('Start date ("'.$record['Start date'].'") or time ("'.$record['Start time'].'") are invalid');
}
$timeEntry->start = $start;
$end = Carbon::createFromFormat('Y-m-d H:i:s', $record['End date'].' '.$record['End time'], 'UTC');
if ($end === false) {
if ($end === null) {
throw new ImportException('End date ("'.$record['End date'].'") or time ("'.$record['End time'].'") are invalid');
}
$timeEntry->end = $end;