Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Fixes for psalm

Browse Source
This commit is contained in:
David Bomba 2022-07-18 10:04:17 +10:00
parent d6ea2225db
commit 5cdb48e7f6
6 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/Utils/Traits/GeneratesCounter.php
View File

@ -122,7 +122,7 @@ trait GeneratesCounter
switch ($entity) {
case Invoice::class:
return 'invoice_number_counter';
break;
case Quote::class:
if ($this->hasSharedCounter($client, 'quote')) {
@ -130,40 +130,35 @@ trait GeneratesCounter
}
return 'quote_number_counter';
break;
case RecurringInvoice::class:
return 'recurring_invoice_number_counter';
break;
case RecurringQuote::class:
return 'recurring_quote_number_counter';
break;
case RecurringExpense::class:
return 'recurring_expense_number_counter';
break;
case Payment::class:
return 'payment_number_counter';
break;
case Credit::class:
if ($this->hasSharedCounter($client, 'credit')) {
return 'invoice_number_counter';
}
return 'credit_number_counter';
break;
case Project::class:
return 'project_number_counter';
break;
case PurchaseOrder::class:
return 'purchase_order_number_counter';
break;
case PurchaseOrder::class:
return 'purchase_order_number_counter';
break;
default:
return 'default_number_counter';
break;
}
}
@ -401,9 +396,8 @@ trait GeneratesCounter
return (bool) $client->getSetting('shared_invoice_quote_counter');
}
if ($type == 'credit') {
return (bool) $client->getSetting('shared_invoice_credit_counter');
}
//credit
return (bool) $client->getSetting('shared_invoice_credit_counter');
}
/**

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

@ -70,7 +70,7 @@ trait MakesDates
/**
* Formats a datedate.
* @param Carbon|string $date Carbon object or date string
* @param $date Carbon object or date string
* @param string $format The date display format
* @return string The formatted date
*/

2
app/Utils/Traits/MakesInvoiceHtml.php
View File

@ -63,7 +63,7 @@ trait MakesInvoiceHtml
ob_end_clean();
}
throw new \Exception($e);
throw new \Exception($e->getMessage());
}
return ob_get_clean();

2
app/Utils/Traits/MakesTemplateData.php
View File

@ -173,7 +173,7 @@ trait MakesTemplateData
$data['$company.id_number'] = ['value' => 'ID-NO-#434', 'label' => ctrans('texts.id_number')];
$data['$company.website'] = ['value' => 'https://invoiceninja.com', 'label' => ctrans('texts.website')];
$data['$company.address'] = ['value' => '5 Kalamazoo Way\n Jimbuckeroo\n USA 90210', 'label' => ctrans('texts.address')];
$data['$company.logo'] = ['value' => "<img src='https://raw.githubusercontent.com/hillelcoren/invoice-ninja/master/public/images/round_logo.png' class='w-48' alt='logo'>" ?: '&nbsp;', 'label' => ctrans('texts.logo')];
$data['$company.logo'] = ['value' => "<img src='https://raw.githubusercontent.com/hillelcoren/invoice-ninja/master/public/images/round_logo.png' class='w-48' alt='logo'>", 'label' => ctrans('texts.logo')];
$data['$company_logo'] = &$data['$company.logo'];
$data['$company1'] = ['value' => 'Company Custom Value 1', 'label' => 'company label1'];
$data['$company2'] = ['value' => 'Company Custom Value 2', 'label' => 'company label2'];

2
app/Utils/VendorHtmlEngine.php
View File

@ -137,7 +137,7 @@ class VendorHtmlEngine
$data['$payment_due'] = ['value' => $this->translateDate($this->entity->due_date, $this->company->date_format(), $this->company->locale()) ?: '&nbsp;', 'label' => ctrans('texts.payment_due')];
$data['$poNumber'] = ['value' => $this->entity->po_number, 'label' => ctrans('texts.po_number')];
$data['$entity.datetime'] = ['value' => $this->formatDatetime($this->entity->created_at, $this->company->date_format(), $this->company->locale()), 'label' => ctrans('texts.date')];
$data['$entity.datetime'] = ['value' => $this->formatDatetime($this->entity->created_at, $this->company->date_format()), 'label' => ctrans('texts.date')];
$data['$entity'] = ['value' => '', 'label' => ctrans('texts.purchase_order')];
$data['$number'] = ['value' => $this->entity->number ?: '&nbsp;', 'label' => ctrans('texts.purchase_order_number')];

3
psalm.xml
View File

@ -15,7 +15,8 @@
<issueHandlers>
<MissingPropertyType errorLevel="suppress" />
<TypeDoesNotContainNull errorLevel="suppress" />
<TypeDoesNotContainType errorLevel="suppress" />
<UndefinedFunction>
<errorLevel type="suppress">
<directory name="app" />