Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 04:04:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure all carbon mutator types are cast appropriately

Browse Source
This commit is contained in:
David Bomba 2024-06-22 21:05:18 +10:00
parent 18e0ced89c
commit cf2fc80f06
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Export/CSV/TaskExport.php
View File

@ -184,13 +184,13 @@ class TaskExport extends BaseExport
foreach ($logs as $key => $item) { foreach ($logs as $key => $item) {
if (in_array('task.start_date', $this->input['report_keys']) || in_array('start_date', $this->input['report_keys'])) { if (in_array('task.start_date', $this->input['report_keys']) || in_array('start_date', $this->input['report_keys'])) {
$carbon_object = Carbon::createFromTimeStamp($item[0])->setTimezone($timezone_name); $carbon_object = Carbon::createFromTimeStamp((int)$item[0])->setTimezone($timezone_name);
$entity['task.start_date'] = $carbon_object->format($date_format_default); $entity['task.start_date'] = $carbon_object->format($date_format_default);
$entity['task.start_time'] = $carbon_object->format('H:i:s'); $entity['task.start_time'] = $carbon_object->format('H:i:s');
} }
if ((in_array('task.end_date', $this->input['report_keys']) || in_array('end_date', $this->input['report_keys'])) && $item[1] > 0) { if ((in_array('task.end_date', $this->input['report_keys']) || in_array('end_date', $this->input['report_keys'])) && $item[1] > 0) {
$carbon_object = Carbon::createFromTimeStamp($item[1])->setTimezone($timezone_name); $carbon_object = Carbon::createFromTimeStamp((int)$item[1])->setTimezone($timezone_name);
$entity['task.end_date'] = $carbon_object->format($date_format_default); $entity['task.end_date'] = $carbon_object->format($date_format_default);
$entity['task.end_time'] = $carbon_object->format('H:i:s'); $entity['task.end_time'] = $carbon_object->format('H:i:s');
} }

4
app/Export/Decorators/TaskDecorator.php
View File

@ -60,7 +60,7 @@ class TaskDecorator extends Decorator implements DecoratorInterface
if(is_array($logs)) { if(is_array($logs)) {
$item = $logs[0]; $item = $logs[0];
return Carbon::createFromTimeStamp($item[0])->setTimezone($timezone_name)->format($date_format_default); return Carbon::createFromTimeStamp((int)$item[0])->setTimezone($timezone_name)->format($date_format_default);
} }
return ''; return '';
@ -89,7 +89,7 @@ class TaskDecorator extends Decorator implements DecoratorInterface
if(is_array($logs)) { if(is_array($logs)) {
$item = $logs[1]; $item = $logs[1];
return Carbon::createFromTimeStamp($item[1])->setTimezone($timezone_name)->format($date_format_default); return Carbon::createFromTimeStamp((int)$item[1])->setTimezone($timezone_name)->format($date_format_default);
} }
return ''; return '';

6
app/Jobs/Ninja/SendReminders.php
View File

@ -188,13 +188,13 @@ class SendReminders implements ShouldQueue
switch ($schedule_reminder) { switch ($schedule_reminder) {
case 'after_invoice_date': case 'after_invoice_date':
return Carbon::parse($invoice->date)->addDays($num_days_reminder)->startOfDay()->addSeconds($offset); return Carbon::parse($invoice->date)->addDays((int)$num_days_reminder)->startOfDay()->addSeconds($offset);
break; break;
case 'before_due_date': case 'before_due_date':
return Carbon::parse($invoice->due_date)->subDays($num_days_reminder)->startOfDay()->addSeconds($offset); return Carbon::parse($invoice->due_date)->subDays((int)$num_days_reminder)->startOfDay()->addSeconds($offset);
break; break;
case 'after_due_date': case 'after_due_date':
return Carbon::parse($invoice->due_date)->addDays($num_days_reminder)->startOfDay()->addSeconds($offset); return Carbon::parse($invoice->due_date)->addDays((int)$num_days_reminder)->startOfDay()->addSeconds($offset);
break; break;
default: default:
return null; return null;

10
app/Models/Task.php
View File

@ -208,7 +208,7 @@ class Task extends BaseModel
$parts = json_decode($this->time_log) ?: []; $parts = json_decode($this->time_log) ?: [];
if (count($parts)) { if (count($parts)) {
return Carbon::createFromTimeStamp($parts[0][0])->timestamp; return Carbon::createFromTimeStamp((int)$parts[0][0])->timestamp;
} else { } else {
return null; return null;
} }
@ -281,11 +281,11 @@ class Task extends BaseModel
$parent_entity = $this->client ?? $this->company; $parent_entity = $this->client ?? $this->company;
if($log[0]) { if($log[0]) {
$log[0] = Carbon::createFromTimestamp($log[0])->format($parent_entity->date_format().' H:i:s'); $log[0] = Carbon::createFromTimestamp((int)$log[0])->format($parent_entity->date_format().' H:i:s');
} }
if($log[1] && $log[1] != 0) { if($log[1] && $log[1] != 0) {
$log[1] = Carbon::createFromTimestamp($log[1])->format($parent_entity->date_format().' H:i:s'); $log[1] = Carbon::createFromTimestamp((int)$log[1])->format($parent_entity->date_format().' H:i:s');
} else { } else {
$log[1] = ctrans('texts.running'); $log[1] = ctrans('texts.running');
} }
@ -313,11 +313,11 @@ class Task extends BaseModel
if($log[0]) { if($log[0]) {
$logged['start_date_raw'] = $log[0]; $logged['start_date_raw'] = $log[0];
} }
$logged['start_date'] = Carbon::createFromTimestamp($log[0])->setTimeZone($this->company->timezone()->name)->format($parent_entity->date_format().' H:i:s'); $logged['start_date'] = Carbon::createFromTimestamp((int)$log[0])->setTimeZone($this->company->timezone()->name)->format($parent_entity->date_format().' H:i:s');
if($log[1] && $log[1] != 0) { if($log[1] && $log[1] != 0) {
$logged['end_date_raw'] = $log[1]; $logged['end_date_raw'] = $log[1];
$logged['end_date'] = Carbon::createFromTimestamp($log[1])->setTimeZone($this->company->timezone()->name)->format($parent_entity->date_format().' H:i:s'); $logged['end_date'] = Carbon::createFromTimestamp((int)$log[1])->setTimeZone($this->company->timezone()->name)->format($parent_entity->date_format().' H:i:s');
} else { } else {
$logged['end_date_raw'] = 0; $logged['end_date_raw'] = 0;
$logged['end_date'] = ctrans('texts.running'); $logged['end_date'] = ctrans('texts.running');

2
app/Repositories/TaskRepository.php
View File

@ -157,7 +157,7 @@ class TaskRepository extends BaseRepository
{ {
if(isset($time_log[0][0])) { if(isset($time_log[0][0])) {
return \Carbon\Carbon::createFromTimestamp($time_log[0][0])->addSeconds($task->company->utc_offset()); return \Carbon\Carbon::createFromTimestamp((int)$time_log[0][0])->addSeconds($task->company->utc_offset());
} }
return null; return null;

4
app/Utils/Traits/MakesDates.php
View File

@ -78,7 +78,7 @@ trait MakesDates
*/ */
public function formatDatetime($date, string $format): string public function formatDatetime($date, string $format): string
{ {
return Carbon::createFromTimestamp($date)->format($format.' g:i a'); return Carbon::createFromTimestamp((int)$date)->format($format.' g:i a');
} }
/** /**
@ -89,7 +89,7 @@ trait MakesDates
*/ */
public function formatDateTimestamp($timestamp, string $format): string public function formatDateTimestamp($timestamp, string $format): string
{ {
return Carbon::createFromTimestamp($timestamp)->format($format); return Carbon::createFromTimestamp((int)$timestamp)->format($format);
} }
private function convertToDateObject($date) private function convertToDateObject($date)