adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-08 08:12:17 +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

2
app/Http/Controllers/Api/V1/ClientController.php
View File

@@ -66,7 +66,7 @@ class ClientController extends Controller
{
$this->checkPermission($organization, 'clients:create');
$client = new Client();
$client = new Client;
$client->name = $request->input('name');
$client->organization()->associate($organization);
$client->save();

7
app/Http/Controllers/Api/V1/Controller.php
View File

@@ -12,8 +12,7 @@ class Controller extends \App\Http\Controllers\Controller
{
public function __construct(
protected PermissionStore $permissionStore,
) {
}
) {}
/**
* @throws AuthorizationException
@@ -21,7 +20,7 @@ class Controller extends \App\Http\Controllers\Controller
protected function checkPermission(Organization $organization, string $permission): void
{
if (! $this->permissionStore->has($organization, $permission)) {
throw new AuthorizationException();
throw new AuthorizationException;
}
}
@@ -37,7 +36,7 @@ class Controller extends \App\Http\Controllers\Controller
return;
}
}
throw new AuthorizationException();
throw new AuthorizationException;
}
protected function hasPermission(Organization $organization, string $permission): bool

2
app/Http/Controllers/Api/V1/ImportController.php
View File

@@ -35,7 +35,7 @@ class ImportController extends Controller
foreach ($importers as $key => $importerClass) {
/** @var ImporterContract $importer */
$importer = new $importerClass();
$importer = new $importerClass;
$importersResponse[] = [
'key' => $key,
'name' => $importer->getName(),

12
app/Http/Controllers/Api/V1/MemberController.php
View File

@@ -82,16 +82,16 @@ class MemberController extends Controller
$newRole = $request->getRole();
$oldRole = Role::from($member->role);
if ($oldRole === Role::Owner) {
throw new OrganizationNeedsAtLeastOneOwner();
throw new OrganizationNeedsAtLeastOneOwner;
}
if ($newRole === Role::Placeholder) {
throw new ChangingRoleToPlaceholderIsNotAllowed();
throw new ChangingRoleToPlaceholderIsNotAllowed;
}
if ($newRole === Role::Owner) {
if ($this->hasPermission($organization, 'members:change-ownership')) {
$memberService->changeOwnership($organization, $member);
} else {
throw new OnlyOwnerCanChangeOwnership();
throw new OnlyOwnerCanChangeOwnership;
}
} else {
$member->role = $request->getRole()->value;
@@ -120,7 +120,7 @@ class MemberController extends Controller
throw new EntityStillInUseApiException('member', 'project_member');
}
if ($member->role === Role::Owner->value) {
throw new CanNotRemoveOwnerFromOrganization();
throw new CanNotRemoveOwnerFromOrganization;
}
$member->delete();
@@ -138,7 +138,7 @@ class MemberController extends Controller
$this->checkPermission($organization, 'members:make-placeholder', $member);
if ($member->role === Role::Owner->value) {
throw new CanNotRemoveOwnerFromOrganization();
throw new CanNotRemoveOwnerFromOrganization;
}
$memberService->makeMemberToPlaceholder($member);
@@ -161,7 +161,7 @@ class MemberController extends Controller
$user = $member->user;
if (! $user->is_placeholder) {
throw new UserNotPlaceholderApiException();
throw new UserNotPlaceholderApiException;
}
$invitationService->inviteUser($organization, $user->email, Role::Employee);

2
app/Http/Controllers/Api/V1/ProjectController.php
View File

@@ -89,7 +89,7 @@ class ProjectController extends Controller
public function store(Organization $organization, ProjectStoreRequest $request): JsonResource
{
$this->checkPermission($organization, 'projects:create');
$project = new Project();
$project = new Project;
$project->name = $request->input('name');
$project->color = $request->input('color');
$project->is_billable = (bool) $request->input('is_billable');

6
app/Http/Controllers/Api/V1/ProjectMemberController.php
View File

@@ -65,13 +65,13 @@ class ProjectMemberController extends Controller
$member = Member::findOrFail((string) $request->input('member_id'));
if ($member->user->is_placeholder) {
throw new InactiveUserCanNotBeUsedApiException();
throw new InactiveUserCanNotBeUsedApiException;
}
if (ProjectMember::whereBelongsTo($project, 'project')->whereBelongsTo($member, 'member')->exists()) {
throw new UserIsAlreadyMemberOfProjectApiException();
throw new UserIsAlreadyMemberOfProjectApiException;
}
$projectMember = new ProjectMember();
$projectMember = new ProjectMember;
$projectMember->billable_rate = $request->getBillableRate();
$projectMember->member()->associate($member);
$projectMember->user()->associate($member->user);

2
app/Http/Controllers/Api/V1/TagController.php
View File

@@ -57,7 +57,7 @@ class TagController extends Controller
{
$this->checkPermission($organization, 'tags:create');
$tag = new Tag();
$tag = new Tag;
$tag->name = $request->input('name');
$tag->organization()->associate($organization);
$tag->save();

2
app/Http/Controllers/Api/V1/TaskController.php
View File

@@ -76,7 +76,7 @@ class TaskController extends Controller
public function store(Organization $organization, TaskStoreRequest $request): JsonResource
{
$this->checkPermission($organization, 'tasks:create');
$task = new Task();
$task = new Task;
$task->name = $request->input('name');
$task->project_id = $request->input('project_id');
$task->organization()->associate($organization);

12
app/Http/Controllers/Api/V1/TimeEntryController.php
View File

@@ -212,12 +212,12 @@ class TimeEntryController extends Controller
}
if ($request->input('end') === null && TimeEntry::query()->whereBelongsTo($member, 'member')->where('end', null)->exists()) {
throw new TimeEntryStillRunningApiException();
throw new TimeEntryStillRunningApiException;
}
$client = $request->input('project_id') !== null ? Project::findOrFail((string) $request->input('project_id'))->client : null;
$timeEntry = new TimeEntry();
$timeEntry = new TimeEntry;
$timeEntry->fill($request->validated());
$timeEntry->client()->associate($client);
$timeEntry->user_id = $member->user_id;
@@ -247,7 +247,7 @@ class TimeEntryController extends Controller
}
if ($timeEntry->end !== null && $request->has('end') && $request->input('end') === null) {
throw new TimeEntryCanNotBeRestartedApiException();
throw new TimeEntryCanNotBeRestartedApiException;
}
if ($request->has('project_id')) {
@@ -285,7 +285,7 @@ class TimeEntryController extends Controller
$changes = $request->validated('changes');
if (isset($changes['member_id']) && ! $canAccessAll && $this->member($organization)->getKey() !== $changes['member_id']) {
throw new AuthorizationException();
throw new AuthorizationException;
}
$client = null;
@@ -295,8 +295,8 @@ class TimeEntryController extends Controller
$overwriteClient = true;
}
$success = new Collection();
$error = new Collection();
$success = new Collection;
$error = new Collection;
foreach ($ids as $id) {
/** @var TimeEntry|null $timeEntry */

4
app/Http/Controllers/Controller.php
View File

@@ -28,7 +28,7 @@ class Controller extends BaseController
$user = Auth::user();
if ($user === null) {
Log::error('This function should only be called in authenticated context');
throw new AuthorizationException();
throw new AuthorizationException;
}
return $user;
@@ -44,7 +44,7 @@ class Controller extends BaseController
$member = Member::query()->whereBelongsTo($organization, 'organization')->whereBelongsTo($user, 'user')->first();
if ($member === null) {
Log::error('This function should only be called in authenticated context after checking the user is a member of the organization');
throw new AuthorizationException();
throw new AuthorizationException;
}
return $member;

4
app/Http/Controllers/Web/Controller.php
View File

@@ -4,6 +4,4 @@ declare(strict_types=1);
namespace App\Http\Controllers\Web;
abstract class Controller extends \App\Http\Controllers\Controller
{
}
abstract class Controller extends \App\Http\Controllers\Controller {}