Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Static Analysis

Browse Source
This commit is contained in:
David Bomba 2024-06-16 14:58:03 +10:00
parent 52752a8f09
commit 3a4f47c1a9
7 changed files with 47 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Exceptions/Handler.php
View File

@ -109,10 +109,11 @@ class Handler extends ExceptionHandler
Integration::configureScope(function (Scope $scope): void { Integration::configureScope(function (Scope $scope): void {
$name = 'hosted@invoiceninja.com'; $name = 'hosted@invoiceninja.com';
if (auth()->guard('contact') && auth()->guard('contact')->user()) { if (auth()->guard('contact') && auth()->guard('contact')->user()) { // @phpstan-ignore-line
$name = 'Contact = '.auth()->guard('contact')->user()->email; $name = 'Contact = '.auth()->guard('contact')->user()->email;
$key = auth()->guard('contact')->user()->company->account->key; $key = auth()->guard('contact')->user()->company->account->key;
} elseif (auth()->guard('user') && auth()->guard('user')->user()) { } elseif (auth()->guard('user') && auth()->guard('user')->user()) { // @phpstan-ignore-line
$name = 'Admin = '.auth()->guard('user')->user()->email; $name = 'Admin = '.auth()->guard('user')->user()->email;
$key = auth()->user()->account->key; $key = auth()->user()->account->key;
} else { } else {
@ -131,13 +132,14 @@ class Handler extends ExceptionHandler
} }
} elseif (app()->bound('sentry')) { } elseif (app()->bound('sentry')) {
Integration::configureScope(function (Scope $scope): void { Integration::configureScope(function (Scope $scope): void {
if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) { if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) {// @phpstan-ignore-line
$scope->setUser([ $scope->setUser([
'id' => auth()->guard('contact')->user()->company->account->key, 'id' => auth()->guard('contact')->user()->company->account->key,
'email' => 'anonymous@example.com', 'email' => 'anonymous@example.com',
'name' => 'Anonymous User', 'name' => 'Anonymous User',
]); ]);
} elseif (auth()->guard('user') && auth()->guard('user')->user() && auth()->user()->companyIsSet() && auth()->user()->company()->account->report_errors) { } elseif (auth()->guard('user') && auth()->guard('user')->user() && auth()->user()->companyIsSet() && auth()->user()->company()->account->report_errors) {// @phpstan-ignore-line
$scope->setUser([ $scope->setUser([
'id' => auth()->user()->account->key, 'id' => auth()->user()->account->key,
'email' => 'anonymous@example.com', 'email' => 'anonymous@example.com',

12
app/Export/CSV/ActivityExport.php
View File

@ -25,8 +25,6 @@ use League\Csv\Writer;
class ActivityExport extends BaseExport class ActivityExport extends BaseExport
{ {
private $entity_transformer;
public string $date_key = 'created_at'; public string $date_key = 'created_at';
private string $date_format = 'YYYY-MM-DD'; private string $date_format = 'YYYY-MM-DD';
@ -43,7 +41,7 @@ class ActivityExport extends BaseExport
{ {
$this->company = $company; $this->company = $company;
$this->input = $input; $this->input = $input;
$this->entity_transformer = new ActivityTransformer();
} }
public function returnJson() public function returnJson()
@ -143,10 +141,10 @@ class ActivityExport extends BaseExport
} }
private function decorateAdvancedFields(Task $task, array $entity): array // private function decorateAdvancedFields(Task $task, array $entity): array
{ // {
return $entity; // return $entity;
} // }
public function processMetaData(array $row, $resource): array public function processMetaData(array $row, $resource): array

6
app/Export/CSV/BaseExport.php
View File

@ -971,9 +971,10 @@ class BaseExport
protected function addPaymentStatusFilters(Builder $query, string $status): Builder protected function addPaymentStatusFilters(Builder $query, string $status): Builder
{ {
/** @var array $status_parameters */
$status_parameters = explode(',', $status); $status_parameters = explode(',', $status);
if(in_array('all', $status_parameters) || count($status_parameters) == 0) { if((count($status_parameters) == 0) || in_array('all', $status_parameters)) {
return $query; return $query;
} }
@ -1028,6 +1029,7 @@ class BaseExport
protected function addRecurringInvoiceStatusFilter(Builder $query, string $status): Builder protected function addRecurringInvoiceStatusFilter(Builder $query, string $status): Builder
{ {
/** @var array $status_parameters */
$status_parameters = explode(',', $status); $status_parameters = explode(',', $status);
if (in_array('all', $status_parameters) || count($status_parameters) == 0) { if (in_array('all', $status_parameters) || count($status_parameters) == 0) {
@ -1132,6 +1134,7 @@ class BaseExport
protected function addPurchaseOrderStatusFilter(Builder $query, string $status): Builder protected function addPurchaseOrderStatusFilter(Builder $query, string $status): Builder
{ {
/** @var array $status_parameters */
$status_parameters = explode(',', $status); $status_parameters = explode(',', $status);
if (in_array('all', $status_parameters) || count($status_parameters) == 0) { if (in_array('all', $status_parameters) || count($status_parameters) == 0) {
@ -1180,6 +1183,7 @@ class BaseExport
protected function addInvoiceStatusFilter(Builder $query, string $status): Builder protected function addInvoiceStatusFilter(Builder $query, string $status): Builder
{ {
/** @var array $status_parameters */
$status_parameters = explode(',', $status); $status_parameters = explode(',', $status);
if(in_array('all', $status_parameters) || count($status_parameters) == 0) { if(in_array('all', $status_parameters) || count($status_parameters) == 0) {

20
app/Export/CSV/ClientExport.php
View File

@ -243,16 +243,16 @@ class ClientExport extends BaseExport
return $entity; return $entity;
} }
private function calculateStatus($client) // private function calculateStatus($client)
{ // {
if ($client->is_deleted) { // if ($client->is_deleted) {
return ctrans('texts.deleted'); // return ctrans('texts.deleted');
} // }
if ($client->deleted_at) { // if ($client->deleted_at) {
return ctrans('texts.archived'); // return ctrans('texts.archived');
} // }
return ctrans('texts.active'); // return ctrans('texts.active');
} // }
} }

2
app/Export/CSV/ContactExport.php
View File

@ -155,7 +155,7 @@ class ContactExport extends BaseExport
} }
if (in_array('client.user_id', $this->input['report_keys'])) { if (in_array('client.user_id', $this->input['report_keys'])) {
$entity['client.user_id'] = $client->user ? $client->user->present()->name() : ''; $entity['client.user_id'] = $client->user ? $client->user->present()->name() : '';// @phpstan-ignore-line
} }
if (in_array('client.assigned_user_id', $this->input['report_keys'])) { if (in_array('client.assigned_user_id', $this->input['report_keys'])) {

20
app/Export/CSV/ProductExport.php
View File

@ -133,16 +133,16 @@ class ProductExport extends BaseExport
// return $this->decorateAdvancedFields($product, $entity); // return $this->decorateAdvancedFields($product, $entity);
} }
private function decorateAdvancedFields(Product $product, array $entity): array // private function decorateAdvancedFields(Product $product, array $entity): array
{ // {
if (in_array('vendor_id', $this->input['report_keys'])) { // if (in_array('vendor_id', $this->input['report_keys'])) {
$entity['vendor'] = $product->vendor()->exists() ? $product->vendor->name : ''; // $entity['vendor'] = $product->vendor()->exists() ? $product->vendor->name : '';
} // }
// if (array_key_exists('project_id', $this->input['report_keys'])) { // // if (array_key_exists('project_id', $this->input['report_keys'])) {
// $entity['project'] = $product->project()->exists() ? $product->project->name : ''; // // $entity['project'] = $product->project()->exists() ? $product->project->name : '';
// } // // }
return $entity; // return $entity;
} // }
} }

18
app/Export/CSV/ProductSalesExport.php
View File

@ -66,11 +66,11 @@ class ProductSalesExport extends BaseExport
'custom_value4' => 'custom_value4', 'custom_value4' => 'custom_value4',
]; ];
private array $decorate_keys = [ // private array $decorate_keys = [
'client', // 'client',
'currency', // 'currency',
'date', // 'date',
]; // ];
public function __construct(Company $company, array $input) public function __construct(Company $company, array $input)
{ {
@ -330,8 +330,8 @@ class ProductSalesExport extends BaseExport
* @param string $product_key * @param string $product_key
* @return ?\Illuminate\Database\Eloquent\Model * @return ?\Illuminate\Database\Eloquent\Model
*/ */
private function getProduct(string $product_key) // private function getProduct(string $product_key)
{ // {
return $this->products->firstWhere('product_key', $product_key); // return $this->products->firstWhere('product_key', $product_key);
} // }
} }