From b332e637b54e8fb92704e1cf4cc22b52a889cdd5 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 7 Aug 2023 18:36:04 +1000 Subject: [PATCH] Updates for static analysis --- app/Utils/Helpers.php | 12 +++++----- app/Utils/TemplateEngine.php | 45 ++++++++++++++++++++---------------- phpstan.neon | 3 ++- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php index 912cc47f71fc..0debc7da4219 100644 --- a/app/Utils/Helpers.php +++ b/app/Utils/Helpers.php @@ -177,27 +177,27 @@ class Helpers 'literal' => [ ':MONTH_BEFORE' => \sprintf( '%s %s %s', - $currentDateTime->copy()->subMonth(1)->translatedFormat($entity->date_format()), + $currentDateTime->copy()->subMonth()->translatedFormat($entity->date_format()), ctrans('texts.to'), - $currentDateTime->copy()->subDay(1)->translatedFormat($entity->date_format()), + $currentDateTime->copy()->subDay()->translatedFormat($entity->date_format()), ), ':YEAR_BEFORE' => \sprintf( '%s %s %s', - $currentDateTime->copy()->subYear(1)->translatedFormat($entity->date_format()), + $currentDateTime->copy()->subYear()->translatedFormat($entity->date_format()), ctrans('texts.to'), - $currentDateTime->copy()->subDay(1)->translatedFormat($entity->date_format()), + $currentDateTime->copy()->subDay()->translatedFormat($entity->date_format()), ), ':MONTH_AFTER' => \sprintf( '%s %s %s', $currentDateTime->translatedFormat($entity->date_format()), ctrans('texts.to'), - $currentDateTime->copy()->addMonth(1)->subDay(1)->translatedFormat($entity->date_format()), + $currentDateTime->copy()->addMonth()->subDay()->translatedFormat($entity->date_format()), ), ':YEAR_AFTER' => \sprintf( '%s %s %s', $currentDateTime->translatedFormat($entity->date_format()), ctrans('texts.to'), - $currentDateTime->copy()->addYear(1)->subDay(1)->translatedFormat($entity->date_format()), + $currentDateTime->copy()->addYear()->subDay()->translatedFormat($entity->date_format()), ), ':MONTHYEAR' => \sprintf( '%s %s', diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php index 51fcb2dc1a95..3cd5221d5de3 100644 --- a/app/Utils/TemplateEngine.php +++ b/app/Utils/TemplateEngine.php @@ -12,27 +12,29 @@ namespace App\Utils; -use App\DataMapper\EmailTemplateDefaults; -use App\Mail\Engine\PaymentEmailEngine; -use App\Models\Client; -use App\Models\ClientContact; -use App\Models\Invoice; -use App\Models\InvoiceInvitation; -use App\Models\Payment; -use App\Models\PurchaseOrder; -use App\Models\PurchaseOrderInvitation; -use App\Models\Quote; -use App\Models\QuoteInvitation; -use App\Models\Vendor; -use App\Models\VendorContact; -use App\Services\PdfMaker\Designs\Utilities\DesignHelpers; -use App\Utils\Traits\MakesHash; -use App\Utils\Traits\MakesInvoiceHtml; -use App\Utils\Traits\MakesTemplateData; use DB; -use Illuminate\Support\Facades\App; +use App\Models\Quote; +use App\Models\Client; +use App\Models\Credit; +use App\Models\Vendor; +use App\Models\Invoice; +use App\Models\Payment; use Illuminate\Support\Str; +use App\Models\ClientContact; +use App\Models\PurchaseOrder; +use App\Models\VendorContact; +use App\Models\QuoteInvitation; +use App\Utils\Traits\MakesHash; +use App\Models\RecurringInvoice; +use App\Models\InvoiceInvitation; +use Illuminate\Support\Facades\App; +use App\Utils\Traits\MakesInvoiceHtml; +use App\Mail\Engine\PaymentEmailEngine; +use App\Models\PurchaseOrderInvitation; +use App\Utils\Traits\MakesTemplateData; +use App\DataMapper\EmailTemplateDefaults; use League\CommonMark\CommonMarkConverter; +use App\Services\PdfMaker\Designs\Utilities\DesignHelpers; class TemplateEngine { @@ -50,7 +52,7 @@ class TemplateEngine public $template; - /** @var \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | null $entity_obj **/ + /** @var Invoice | Quote | Credit | PurchaseOrder | RecurringInvoice | null $entity_obj **/ private $entity_obj; /** @var \App\Models\Company | \App\Models\Client | null $settings_entity **/ @@ -340,6 +342,7 @@ class TemplateEngine 'client_contact_id' => $contact->id, ]); + /** @var \App\Models\Invoice $invoice */ $this->entity_obj->invoices()->attach($invoice->id, [ 'amount' => 10, ]); @@ -378,11 +381,13 @@ class TemplateEngine } if ($this->entity == 'purchaseOrder') { + /** @var \App\Models\Vendor $vendor **/ $vendor = Vendor::factory()->create([ 'user_id' => $user->id, 'company_id' => $user->company()->id, ]); + /** @var \App\Models\VendorContact $contact **/ $contact = VendorContact::factory()->create([ 'user_id' => $user->id, 'company_id' => $user->company()->id, @@ -391,13 +396,13 @@ class TemplateEngine 'send_email' => true, ]); - $this->entity_obj = PurchaseOrder::factory()->create([ 'user_id' => $user->id, 'company_id' => $user->company()->id, 'vendor_id' => $vendor->id, ]); + /** @var \App\Models\PurchaseOrderInvitation $invitation **/ $invitation = PurchaseOrderInvitation::factory()->create([ 'user_id' => $user->id, 'company_id' => $user->company()->id, diff --git a/phpstan.neon b/phpstan.neon index 670c37f46795..7aec499ed7bd 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -21,4 +21,5 @@ parameters: - '#Call to an undefined method [a-zA-Z0-9\\_]+::exclude\(\)#' - '#Array has 2 duplicate keys with value#' - '#Undefined method#' - - '#makeHidden#' \ No newline at end of file + - '#makeHidden#' + - '#Socialite#' \ No newline at end of file