From 4537e1be179ee584cf1b093b1fde1bbb20430d5b Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 29 Aug 2023 08:53:25 +1000 Subject: [PATCH] Static analysis cleanup --- app/Http/Controllers/BankTransactionController.php | 10 ++++++++-- app/Repositories/BaseRepository.php | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/BankTransactionController.php b/app/Http/Controllers/BankTransactionController.php index 69261d4882db..acfdf62c495a 100644 --- a/app/Http/Controllers/BankTransactionController.php +++ b/app/Http/Controllers/BankTransactionController.php @@ -71,15 +71,21 @@ class BankTransactionController extends BaseController public function create(CreateBankTransactionRequest $request) { - $bank_transaction = BankTransactionFactory::create(auth()->user()->company()->id, auth()->user()->id); + /** @var \App\Models\User $user */ + $user = auth()->user(); + + $bank_transaction = BankTransactionFactory::create($user->company()->id, $user->id); return $this->itemResponse($bank_transaction); } public function store(StoreBankTransactionRequest $request) { + /** @var \App\Models\User $user */ + $user = auth()->user(); + //stub to store the model - $bank_transaction = $this->bank_transaction_repo->save($request->all(), BankTransactionFactory::create(auth()->user()->company()->id, auth()->user()->id)); + $bank_transaction = $this->bank_transaction_repo->save($request->all(), BankTransactionFactory::create($user->company()->id, $user->id)); return $this->itemResponse($bank_transaction); } diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php index b2c5aaad97d2..f392d24f3693 100644 --- a/app/Repositories/BaseRepository.php +++ b/app/Repositories/BaseRepository.php @@ -153,7 +153,7 @@ class BaseRepository $model->client_id = $data['client_id']; } - $client = Client::with('group_settings')->where('id', $model->client_id)->withTrashed()->firstOrFail(); + $client = Client::query()->with('group_settings')->where('id', $model->client_id)->withTrashed()->firstOrFail(); $state = [];