From d22c9a3bd9acd004768a07e3ad61c43ced075e7d Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 11 Jul 2024 15:53:18 +1000 Subject: [PATCH] Static analysis --- app/Export/CSV/ActivityExport.php | 4 ++++ app/Export/CSV/ClientExport.php | 4 ++++ app/Export/CSV/TaskExport.php | 4 ++-- app/Export/Decorators/TaskDecorator.php | 4 ++-- app/Factory/RecurringExpenseToExpenseFactory.php | 2 +- app/Helpers/Generic.php | 4 ++-- app/Http/Controllers/MigrationController.php | 4 ++-- app/Http/Controllers/PreviewController.php | 2 +- app/Http/Requests/Task/StoreTaskRequest.php | 2 +- app/Http/Requests/Task/UpdateTaskRequest.php | 2 +- app/Import/Transformer/Csv/ExpenseTransformer.php | 2 +- app/Jobs/Product/UpdateOrCreateProduct.php | 2 +- app/Jobs/RecurringInvoice/SendRecurring.php | 2 +- app/Jobs/Util/Import.php | 9 ++++----- app/Jobs/Util/StartMigration.php | 2 +- app/Jobs/Vendor/CreatePurchaseOrderPdf.php | 2 +- .../Migration/PaymentMigrationRepository.php | 2 +- app/Repositories/SubscriptionRepository.php | 2 +- app/Services/Pdf/PdfConfiguration.php | 2 +- app/Services/Pdf/PdfService.php | 2 +- app/Utils/Helpers.php | 2 +- app/Utils/Number.php | 2 +- app/Utils/Traits/Pdf/PdfMaker.php | 4 ++-- phpstan.neon | 2 +- 24 files changed, 38 insertions(+), 31 deletions(-) diff --git a/app/Export/CSV/ActivityExport.php b/app/Export/CSV/ActivityExport.php index fea9ba8722cd..b148c9806daf 100644 --- a/app/Export/CSV/ActivityExport.php +++ b/app/Export/CSV/ActivityExport.php @@ -57,6 +57,7 @@ class ActivityExport extends BaseExport $report = $query->cursor() ->map(function ($resource) { + /** @var \App\Models\Activity $resource */ $row = $this->buildActivityRow($resource); return $this->processMetaData($row, $resource); })->toArray(); @@ -128,6 +129,9 @@ class ActivityExport extends BaseExport $query->cursor() ->each(function ($entity) { + + /** @var \App\Models\Activity $entity */ + $this->buildRow($entity); }); diff --git a/app/Export/CSV/ClientExport.php b/app/Export/CSV/ClientExport.php index f0a5314f76e6..ec4374948cd8 100644 --- a/app/Export/CSV/ClientExport.php +++ b/app/Export/CSV/ClientExport.php @@ -102,6 +102,8 @@ class ClientExport extends BaseExport $report = $query->cursor() ->map(function ($client) { + + /** @var \App\Models\Client $client */ $row = $this->buildRow($client); return $this->processMetaData($row, $client); })->toArray(); @@ -154,6 +156,8 @@ class ClientExport extends BaseExport $query->cursor() ->each(function ($client) { + + /** @var \App\Models\Client $client */ $this->csv->insertOne($this->buildRow($client)); }); diff --git a/app/Export/CSV/TaskExport.php b/app/Export/CSV/TaskExport.php index f630517a2c81..98da6fda1750 100644 --- a/app/Export/CSV/TaskExport.php +++ b/app/Export/CSV/TaskExport.php @@ -161,7 +161,7 @@ class TaskExport extends BaseExport } - if (is_null($task->time_log) || (is_array(json_decode($task->time_log, 1)) && count(json_decode($task->time_log, 1)) == 0)) { + if (is_null($task->time_log) || (is_array(json_decode($task->time_log, true)) && count(json_decode($task->time_log, true)) == 0)) { $this->storage_array[] = $entity; } else { $this->iterateLogs($task, $entity); @@ -178,7 +178,7 @@ class TaskExport extends BaseExport $timezone_name = $timezone->name; } - $logs = json_decode($task->time_log, 1); + $logs = json_decode($task->time_log, true); $date_format_default = $this->date_format; diff --git a/app/Export/Decorators/TaskDecorator.php b/app/Export/Decorators/TaskDecorator.php index 0b48e1cdc613..05f7c2e69690 100644 --- a/app/Export/Decorators/TaskDecorator.php +++ b/app/Export/Decorators/TaskDecorator.php @@ -48,7 +48,7 @@ class TaskDecorator extends Decorator implements DecoratorInterface $timezone_name = $timezone->name; } - $logs = json_decode($task->time_log, 1); + $logs = json_decode($task->time_log, true); $date_format_default = 'Y-m-d'; @@ -77,7 +77,7 @@ class TaskDecorator extends Decorator implements DecoratorInterface $timezone_name = $timezone->name; } - $logs = json_decode($task->time_log, 1); + $logs = json_decode($task->time_log, true); $date_format_default = 'Y-m-d'; diff --git a/app/Factory/RecurringExpenseToExpenseFactory.php b/app/Factory/RecurringExpenseToExpenseFactory.php index d1903408409b..e6699e1fb77c 100644 --- a/app/Factory/RecurringExpenseToExpenseFactory.php +++ b/app/Factory/RecurringExpenseToExpenseFactory.php @@ -175,7 +175,7 @@ class RecurringExpenseToExpenseFactory $_value = explode($_operation, $right); // [MONTHYEAR, 4] - $_right = Carbon::createFromDate(now()->year, now()->month)->addMonths($_value[1])->translatedFormat('F Y'); + $_right = Carbon::createFromDate(now()->year, now()->month)->addMonths($_value[1])->translatedFormat('F Y'); //@phpstan-ignore-line } $replacement = sprintf('%s to %s', $_left, $_right); diff --git a/app/Helpers/Generic.php b/app/Helpers/Generic.php index 33c5b4ba801f..65846b786792 100644 --- a/app/Helpers/Generic.php +++ b/app/Helpers/Generic.php @@ -27,7 +27,7 @@ function nlog($output, $context = []): void } if (gettype($output) == 'object') { - $output = print_r($output, 1); + $output = print_r($output, true); } // $trace = debug_backtrace(); @@ -53,7 +53,7 @@ function nrlog($output, $context = []): void } if (gettype($output) == 'object') { - $output = print_r($output, 1); + $output = print_r($output, true); } // $trace = debug_backtrace(); diff --git a/app/Http/Controllers/MigrationController.php b/app/Http/Controllers/MigrationController.php index 11123bf830d7..d51eb417fb6a 100644 --- a/app/Http/Controllers/MigrationController.php +++ b/app/Http/Controllers/MigrationController.php @@ -267,7 +267,7 @@ class MigrationController extends BaseController if ($request->companies) { //handle Laravel 5.5 UniHTTP - $companies = json_decode($request->companies, 1); + $companies = json_decode($request->companies, true); } else { //handle Laravel 6 Guzzle $companies = []; @@ -275,7 +275,7 @@ class MigrationController extends BaseController foreach ($request->all() as $input) { if ($input instanceof UploadedFile) { } else { - $companies[] = json_decode($input, 1); + $companies[] = json_decode($input, true); } } } diff --git a/app/Http/Controllers/PreviewController.php b/app/Http/Controllers/PreviewController.php index bbfa9b150368..e1db201eab31 100644 --- a/app/Http/Controllers/PreviewController.php +++ b/app/Http/Controllers/PreviewController.php @@ -288,7 +288,7 @@ class PreviewController extends BaseController /** @var \App\Models\Company $company */ $company = $user->company(); - $design_object = json_decode(json_encode(request()->input('design')), 1); + $design_object = json_decode(json_encode(request()->input('design')), true); $ts = (new TemplateService()); diff --git a/app/Http/Requests/Task/StoreTaskRequest.php b/app/Http/Requests/Task/StoreTaskRequest.php index f61bc4267a23..9c5462add8c9 100644 --- a/app/Http/Requests/Task/StoreTaskRequest.php +++ b/app/Http/Requests/Task/StoreTaskRequest.php @@ -69,7 +69,7 @@ class StoreTaskRequest extends Request foreach ($values as $k) { if (!is_int($k[0]) || !is_int($k[1])) { - return $fail('The '.$attribute.' - '.print_r($k, 1).' is invalid. Unix timestamps only.'); + return $fail('The '.$attribute.' - '.print_r($k, true).' is invalid. Unix timestamps only.'); } } diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php index 85b2c4de955b..0944fb4eee1e 100644 --- a/app/Http/Requests/Task/UpdateTaskRequest.php +++ b/app/Http/Requests/Task/UpdateTaskRequest.php @@ -75,7 +75,7 @@ class UpdateTaskRequest extends Request foreach ($values as $k) { if (!is_int($k[0]) || !is_int($k[1])) { - return $fail('The '.$attribute.' - '.print_r($k, 1).' is invalid. Unix timestamps only.'); + return $fail('The '.$attribute.' - '.print_r($k, true).' is invalid. Unix timestamps only.'); } } diff --git a/app/Import/Transformer/Csv/ExpenseTransformer.php b/app/Import/Transformer/Csv/ExpenseTransformer.php index c641662b41f8..d69fa4ca68d1 100644 --- a/app/Import/Transformer/Csv/ExpenseTransformer.php +++ b/app/Import/Transformer/Csv/ExpenseTransformer.php @@ -42,7 +42,7 @@ class ExpenseTransformer extends BaseTransformer 'client_id' => isset($data['expense.client']) ? $this->getClientId($data['expense.client']) : null, - 'date' => strlen($this->getString($data, 'expense.date') > 1) ? $this->parseDate($data['expense.date']) : now()->format('Y-m-d'), + 'date' => strlen($this->getString($data, 'expense.date')) > 1 ? $this->parseDate($data['expense.date']) : now()->format('Y-m-d'), 'public_notes' => $this->getString($data, 'expense.public_notes'), 'private_notes' => $this->getString($data, 'expense.private_notes'), 'category_id' => isset($data['expense.category']) diff --git a/app/Jobs/Product/UpdateOrCreateProduct.php b/app/Jobs/Product/UpdateOrCreateProduct.php index fbfc1e8853cb..82fc0c06dda4 100644 --- a/app/Jobs/Product/UpdateOrCreateProduct.php +++ b/app/Jobs/Product/UpdateOrCreateProduct.php @@ -140,6 +140,6 @@ class UpdateOrCreateProduct implements ShouldQueue public function failed($exception = null) { info('update create failed with = '); - info(print_r($exception->getMessage(), 1)); + nlog($exception->getMessage()); } } diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index 6a57330f1eca..a856539a642a 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -202,6 +202,6 @@ class SendRecurring implements ShouldQueue LightLogs::create($job_failure) ->send(); - nlog(print_r($exception->getMessage(), 1)); + nlog($exception->getMessage()); } } diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 696b37bee891..01775fee78f4 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -212,7 +212,7 @@ class Import implements ShouldQueue $user->setCompany($this->company); - $array = json_decode(file_get_contents($this->file_path), 1); + $array = json_decode(file_get_contents($this->file_path), true); $data = $array['data']; foreach ($this->available_imports as $import) { @@ -2010,7 +2010,7 @@ class Import implements ShouldQueue public function transformId($resource, string $old): int { if (! array_key_exists($resource, $this->ids)) { - info(print_r($resource, 1)); + nlog($resource); throw new Exception("Resource {$resource} not available."); } @@ -2067,11 +2067,10 @@ class Import implements ShouldQueue LightLogs::create($job_failure) ->queue(); - nlog(print_r($exception->getMessage(), 1)); + nlog($exception->getMessage()); - // if (Ninja::isHosted()) { app('sentry')->captureException($exception); - // } + } diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php index 3d28465d2c30..77b9ed9f7abd 100644 --- a/app/Jobs/Util/StartMigration.php +++ b/app/Jobs/Util/StartMigration.php @@ -168,6 +168,6 @@ class StartMigration implements ShouldQueue public function failed($exception = null) { - info(print_r($exception->getMessage(), 1)); + nlog($exception->getMessage()); } } diff --git a/app/Jobs/Vendor/CreatePurchaseOrderPdf.php b/app/Jobs/Vendor/CreatePurchaseOrderPdf.php index 824ac6424f5b..d40765b560d9 100644 --- a/app/Jobs/Vendor/CreatePurchaseOrderPdf.php +++ b/app/Jobs/Vendor/CreatePurchaseOrderPdf.php @@ -199,7 +199,7 @@ class CreatePurchaseOrderPdf implements ShouldQueue } } } catch (\Exception $e) { - nlog(print_r($e->getMessage(), 1)); + nlog($e->getMessage()); } if (config('ninja.log_pdf_html')) { diff --git a/app/Repositories/Migration/PaymentMigrationRepository.php b/app/Repositories/Migration/PaymentMigrationRepository.php index 51bcdb51b826..0ece566f2e08 100644 --- a/app/Repositories/Migration/PaymentMigrationRepository.php +++ b/app/Repositories/Migration/PaymentMigrationRepository.php @@ -87,7 +87,7 @@ class PaymentMigrationRepository extends BaseRepository if (! array_key_exists('status_id', $data)) { info('payment with no status id?'); - info(print_r($data, 1)); + info(print_r($data, true)); } $payment->status_id = $data['status_id']; diff --git a/app/Repositories/SubscriptionRepository.php b/app/Repositories/SubscriptionRepository.php index e340b0e78d51..e7d971f0d379 100644 --- a/app/Repositories/SubscriptionRepository.php +++ b/app/Repositories/SubscriptionRepository.php @@ -130,7 +130,7 @@ class SubscriptionRepository extends BaseRepository private function convertV3Bundle($bundle): array { if(is_object($bundle)) { - $bundle = json_decode(json_encode($bundle), 1); + $bundle = json_decode(json_encode($bundle), true); } $items = []; diff --git a/app/Services/Pdf/PdfConfiguration.php b/app/Services/Pdf/PdfConfiguration.php index fddbc0766ae2..4c9548bdb92e 100644 --- a/app/Services/Pdf/PdfConfiguration.php +++ b/app/Services/Pdf/PdfConfiguration.php @@ -386,7 +386,7 @@ class PdfConfiguration $decimal = $this->country->decimal_separator; } - if (isset($this->country->swap_currency_symbol) && strlen($this->country->swap_currency_symbol) >= 1) { + if (isset($this->country->swap_currency_symbol) && $this->country->swap_currency_symbol == 1) { $swapSymbol = $this->country->swap_currency_symbol; } diff --git a/app/Services/Pdf/PdfService.php b/app/Services/Pdf/PdfService.php index 4a579db80c52..85d115e8a476 100644 --- a/app/Services/Pdf/PdfService.php +++ b/app/Services/Pdf/PdfService.php @@ -102,7 +102,7 @@ class PdfService } } catch (\Exception $e) { - nlog(print_r($e->getMessage(), 1)); + nlog($e->getMessage()); throw new \Exception($e->getMessage(), $e->getCode()); } diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php index 4d5fd38d486d..e0e7d9e64e21 100644 --- a/app/Utils/Helpers.php +++ b/app/Utils/Helpers.php @@ -279,7 +279,7 @@ class Helpers $_value = explode($_operation, $right); // [MONTHYEAR, 4] - $_right = Carbon::createFromDate($currentDateTime->year, $currentDateTime->month)->addMonths($_value[1])->translatedFormat('F Y'); + $_right = Carbon::createFromDate($currentDateTime->year, $currentDateTime->month)->addMonths($_value[1])->translatedFormat('F Y'); //@phpstan-ignore-line } $replacement = sprintf('%s to %s', $_left, $_right); diff --git a/app/Utils/Number.php b/app/Utils/Number.php index 2a8b592a6a99..c1d601a80e61 100644 --- a/app/Utils/Number.php +++ b/app/Utils/Number.php @@ -255,7 +255,7 @@ class Number $decimal = $country->decimal_separator; } - if (isset($country->swap_currency_symbol) && strlen($country->swap_currency_symbol) >= 1) { + if (isset($country->swap_currency_symbol) && $country->swap_currency_symbol == 1) { $swapSymbol = $country->swap_currency_symbol; } diff --git a/app/Utils/Traits/Pdf/PdfMaker.php b/app/Utils/Traits/Pdf/PdfMaker.php index 112570272f4a..fa3c70f6b872 100644 --- a/app/Utils/Traits/Pdf/PdfMaker.php +++ b/app/Utils/Traits/Pdf/PdfMaker.php @@ -20,8 +20,8 @@ trait PdfMaker /** * Returns a PDF stream. * - * @param string $header Header to be included in PDF - * @param string $footer Footer to be included in PDF + * @param string|null $header Header to be included in PDF + * @param string|null $footer Footer to be included in PDF * @param string $html The HTML object to be converted into PDF * * @return string The PDF string diff --git a/phpstan.neon b/phpstan.neon index df2082796c5b..1811c3080b13 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -3,7 +3,7 @@ includes: - ./vendor/spaze/phpstan-stripe/extension.neon - phpstan-baseline.neon parameters: - level: 4 + level: 5 paths: - app excludePaths: