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

Updated dependencies; Fixed codeformatting and phpstan

Browse Source
This commit is contained in:
Constantin Graf
2024-07-31 12:53:41 +02:00
committed by Constantin Graf
parent 5b7df869ad
commit d8968399d6
78 changed files with 1038 additions and 1148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Service/DashboardService.php
View File

@@ -30,7 +30,7 @@ class DashboardService
*/
private function lastDays(int $days, CarbonTimeZone $timeZone): Collection
{
$result = new Collection();
$result = new Collection;
$date = Carbon::now($timeZone)->subDays($days);
for ($i = 0; $i < $days; $i++) {
$date->addDay();
@@ -77,7 +77,7 @@ class DashboardService
*/
private function daysOfThisWeek(CarbonTimeZone $timeZone, Weekday $startOfWeek): Collection
{
$result = new Collection();
$result = new Collection;
$date = Carbon::now($timeZone);
$start = $date->startOfWeek($startOfWeek->carbonWeekDay());
for ($i = 0; $i < 7; $i++) {

2
app/Service/DeletionService.php
View File

@@ -145,7 +145,7 @@ class DeletionService
foreach ($members as $member) {
if ($member->role === Role::Owner->value && $member->organization->users()->count() > 1) {
throw new CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers();
throw new CanNotDeleteUserWhoIsOwnerOfOrganizationWithMultipleMembers;
}
}

4
app/Service/Export/ExportService.php
View File

@@ -319,7 +319,7 @@ class ExportService
// Create ZIP file
$temporaryDirectoryZip = TemporaryDirectory::make();
$zip = new ZipArchive();
$zip = new ZipArchive;
if ($zip->open($temporaryDirectoryZip->path('export.zip'), ZipArchive::CREATE) !== true) {
throw new Exception('Cannot create ZIP file');
}
@@ -356,7 +356,7 @@ class ExportService
} catch (UnavailableStream|CannotInsertRecord|Exception|LeagueCsvException $exception) {
report($exception);
throw new ExportException();
throw new ExportException;
}
}
}

4
app/Service/Import/ImportDatabaseHelper.php
View File

@@ -98,7 +98,7 @@ class ImportDatabaseHelper
throw new ImportException('Invalid data: '.implode(', ', $validator->errors()->all()));
}
$model = new $this->model();
$model = new $this->model;
foreach ($data as $key => $value) {
$model->{$key} = $value;
}
@@ -240,7 +240,7 @@ class ImportDatabaseHelper
{
if ($this->mapIdentifierToKey === null) {
$select = $this->identifiers;
$select[] = (new $this->model())->getKeyName();
$select[] = (new $this->model)->getKeyName();
$builder = $this->getModelInstance();
if ($this->queryModifier !== null) {

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

@@ -98,7 +98,7 @@ class ClockifyTimeEntriesImporter extends DefaultImporter
'organization_id' => $this->organization->id,
]);
}
$timeEntry = new TimeEntry();
$timeEntry = new TimeEntry;
$timeEntry->user_id = $userId;
$timeEntry->member_id = $memberId;
$timeEntry->task_id = $taskId;

11
app/Service/Import/Importers/DefaultImporter.php
View File

@@ -118,7 +118,7 @@ abstract class DefaultImporter implements ImporterContract
$project->billable_rate = null;
}
});
$this->projectMemberImportHelper = new ImportDatabaseHelper(ProjectMember::class, ['project_id', 'member_id'], true, function (Builder $builder) {
$this->projectMemberImportHelper = new ImportDatabaseHelper(ProjectMember::class, ['project_id', 'member_id'], true, function (Builder $builder): Builder {
/** @var Builder<ProjectMember> $builder */
return $builder->whereBelongsToOrganization($this->organization);
}, validate: [
@@ -131,7 +131,8 @@ abstract class DefaultImporter implements ImporterContract
$projectMember->billable_rate = null;
}
});
$this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder) {
$this->tagImportHelper = new ImportDatabaseHelper(Tag::class, ['name', 'organization_id'], true, function (Builder $builder): Builder {
/** @var Builder<Tag> $builder */
return $builder->where('organization_id', $this->organization->id);
}, validate: [
'name' => [
@@ -139,7 +140,8 @@ abstract class DefaultImporter implements ImporterContract
'max:255',
],
]);
$this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder) {
$this->clientImportHelper = new ImportDatabaseHelper(Client::class, ['name', 'organization_id'], true, function (Builder $builder): Builder {
/** @var Builder<Client> $builder */
return $builder->where('organization_id', $this->organization->id);
}, validate: [
'name' => [
@@ -147,7 +149,8 @@ abstract class DefaultImporter implements ImporterContract
'max:255',
],
]);
$this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder) {
$this->taskImportHelper = new ImportDatabaseHelper(Task::class, ['name', 'project_id', 'organization_id'], true, function (Builder $builder): Builder {
/** @var Builder<Task> $builder */
return $builder->where('organization_id', $this->organization->id);
}, validate: [
'name' => [

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

@@ -4,6 +4,4 @@ declare(strict_types=1);
namespace App\Service\Import\Importers;
class ImportException extends \Exception
{
}
class ImportException extends \Exception {}

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

@@ -31,7 +31,7 @@ class SolidtimeImporter extends DefaultImporter
$temporaryDirectoryZip = null;
$temporaryDirectory = null;
try {
$zip = new ZipArchive();
$zip = new ZipArchive;
$temporaryDirectoryZip = TemporaryDirectory::make();
file_put_contents($temporaryDirectoryZip->path('import.zip'), $data);
$res = $zip->open($temporaryDirectoryZip->path('import.zip'), ZipArchive::RDONLY);
@@ -220,7 +220,7 @@ class SolidtimeImporter extends DefaultImporter
if ($timeEntryRow['task_id'] !== '') {
$taskId = $this->taskImportHelper->getKeyByExternalIdentifier($timeEntryRow['task_id']);
}
$timeEntry = new TimeEntry();
$timeEntry = new TimeEntry;
$timeEntry->user_id = $userId;
$timeEntry->member_id = $memberId;
$timeEntry->task_id = $taskId;

2
app/Service/Import/Importers/TogglDataImporter.php
View File

@@ -23,7 +23,7 @@ class TogglDataImporter extends DefaultImporter
$temporaryDirectoryZip = null;
$temporaryDirectory = null;
try {
$zip = new ZipArchive();
$zip = new ZipArchive;
$temporaryDirectoryZip = TemporaryDirectory::make();
file_put_contents($temporaryDirectoryZip->path('import.zip'), $data);
$res = $zip->open($temporaryDirectoryZip->path('import.zip'), ZipArchive::RDONLY);

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

@@ -98,7 +98,7 @@ class TogglTimeEntriesImporter extends DefaultImporter
'organization_id' => $this->organization->id,
]);
}
$timeEntry = new TimeEntry();
$timeEntry = new TimeEntry;
$timeEntry->user_id = $userId;
$timeEntry->member_id = $memberId;
$timeEntry->task_id = $taskId;

4
app/Service/InvitationService.php
View File

@@ -25,12 +25,12 @@ class InvitationService
->whereRelation('user', 'email', '=', $email)
->where('role', '!=', Role::Placeholder->value)
->exists()) {
throw new UserIsAlreadyMemberOfOrganizationApiException();
throw new UserIsAlreadyMemberOfOrganizationApiException;
}
InvitingTeamMember::dispatch($organization, $email, $role->value);
$invitation = new OrganizationInvitation();
$invitation = new OrganizationInvitation;
$invitation->email = $email;
$invitation->role = $role->value;
$invitation->organization()->associate($organization);

2
app/Service/TimeEntryAggregationService.php
View File

@@ -281,7 +281,7 @@ class TimeEntryAggregationService
if ($start->gt($end)) {
throw new \InvalidArgumentException('Start date must be before end date');
}
$slots = new Collection();
$slots = new Collection;
$current = $start->copy()->timezone($timezone);
if ($interval === TimeEntryAggregationTypeInterval::Day) {
$current->startOfDay();

2
app/Service/UserService.php
View File

@@ -60,7 +60,7 @@ class UserService
}
// Create a new organization
$organization = new Organization();
$organization = new Organization;
$organization->name = $user->name."'s Organization";
$organization->personal_team = true;
$organization->user_id = $user->id;