diff --git a/app/Repositories/CompanyRepository.php b/app/Repositories/CompanyRepository.php
index b68df6b6e342..70941a8a0ae0 100644
--- a/app/Repositories/CompanyRepository.php
+++ b/app/Repositories/CompanyRepository.php
@@ -28,7 +28,7 @@ class CompanyRepository extends BaseRepository
*
* @param array $data The data
* @param Company $company
- * @return Client|Company|null Company Object
+ * @return Company|null Company Object
*/
public function save(array $data, Company $company) : ?Company
{
diff --git a/app/Repositories/DocumentRepository.php b/app/Repositories/DocumentRepository.php
index 1c60366f618f..b9521dc954cd 100644
--- a/app/Repositories/DocumentRepository.php
+++ b/app/Repositories/DocumentRepository.php
@@ -34,8 +34,8 @@ class DocumentRepository extends BaseRepository
$document->restore();
- if (class_exists($className)) {
- event(new $className($document, $document->company, Ninja::eventVars()));
- }
+ // if (class_exists($className)) {
+ // event(new $className($document, $document->company, Ninja::eventVars()));
+ // }
}
}
diff --git a/app/Repositories/ExpenseRepository.php b/app/Repositories/ExpenseRepository.php
index 310a9315aad5..da7f7f80c916 100644
--- a/app/Repositories/ExpenseRepository.php
+++ b/app/Repositories/ExpenseRepository.php
@@ -28,10 +28,10 @@ class ExpenseRepository extends BaseRepository
/**
* Saves the expense and its contacts.
*
- * @param array $data The data
- * @param \App\Models\expense $expense The expense
+ * @param array $data The data
+ * @param \App\Models\Expense $expense The expense
*
- * @return expense|null expense Object
+ * @return \App\Models\Expense|Null expense Object
*/
public function save(array $data, Expense $expense) : ?Expense
{
@@ -50,7 +50,7 @@ class ExpenseRepository extends BaseRepository
* Store expenses in bulk.
*
* @param array $expense
- * @return expense|null
+ * @return \App\Models\Expense|null
*/
public function create($expense): ?Expense
{
diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php
index 8a286902917b..a80e2e5e6da3 100644
--- a/app/Repositories/InvoiceRepository.php
+++ b/app/Repositories/InvoiceRepository.php
@@ -66,18 +66,16 @@ class InvoiceRepository extends BaseRepository
* ie. invoice can be deleted from a business logic perspective.
*
* @param Invoice $invoice
- * @return void $invoice
+ * @return Invoice $invoice
*/
- public function delete($invoice)
+ public function delete($invoice) :Invoice
{
if ($invoice->is_deleted) {
- return;
+ return $invoice;
}
$invoice->service()->markDeleted()->handleCancellation()->save();
-
-
$invoice = parent::delete($invoice);
return $invoice;
diff --git a/app/Repositories/Migration/InvoiceMigrationRepository.php b/app/Repositories/Migration/InvoiceMigrationRepository.php
index 9230c9a80bfd..1b28ec5c52f5 100644
--- a/app/Repositories/Migration/InvoiceMigrationRepository.php
+++ b/app/Repositories/Migration/InvoiceMigrationRepository.php
@@ -100,7 +100,7 @@ class InvoiceMigrationRepository extends BaseRepository
$invitations = collect($data['invitations']);
/* Get array of Keys which have been removed from the invitations array and soft delete each invitation */
- $model->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) {
+ $model->invitations->pluck('key')->diff($invitations->pluck('key'))->each(function ($invitation) use($resource){
$this->getInvitation($invitation, $resource)->delete();
});
diff --git a/psalm.xml b/psalm.xml
index ba56482e2e13..2c1858a64e00 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -66,6 +66,11 @@
+
+
+
+
+