Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-19 16:01:34 +02:00
Code Issues Releases Activity

Static analysis cleanup

Browse Source
This commit is contained in:
David Bomba 2023-08-01 22:36:04 +10:00
parent 860749f7d5
commit 908161eae7
10 changed files with 34 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -623,9 +623,6 @@ class BaseExport
} elseif ($transformed_invoice && array_key_exists(str_replace("invoice.", "", $column), $transformed_invoice)) {
return $transformed_invoice[$column];
}
// if($column == 'status')
// return $entity->stringStatus($entity->status_id);
return '';
}

4
app/Http/Requests/Payment/RefundPaymentRequest.php
View File

@ -28,7 +28,9 @@ class RefundPaymentRequest extends Request
*/
public function authorize() : bool
{
return auth()->user()->isAdmin();
/** @var \App\Models\User $user */
$user = auth()->user();
return $user->isAdmin();
}
public function prepareForValidation()

2
app/Http/ValidationRules/ValidRefundableInvoices.php
View File

@ -45,6 +45,7 @@ class ValidRefundableInvoices implements Rule
return false;
}
/**@var \App\Models\Payment $payment */
$payment = Payment::whereId($this->input['id'])->first();
if (! $payment) {
@ -71,7 +72,6 @@ class ValidRefundableInvoices implements Rule
foreach ($this->input['invoices'] as $val) {
if ($val['invoice_id'] == $invoice->id) {
//$pivot_record = $invoice->payments->where('id', $invoice->id)->first();
$pivot_record = $payment->paymentables->where('paymentable_id', $invoice->id)->first();
if ($val['amount'] > ($pivot_record->amount - $pivot_record->refunded)) {

32
app/Models/Activity.php
View File

@ -67,37 +67,7 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
* @property-read \App\Models\VendorContact|null $vendor_contact
* @method static \Illuminate\Database\Eloquent\Builder|StaticModel company()
* @method static \Illuminate\Database\Eloquent\Builder|StaticModel exclude($columns)
* @method static \Illuminate\Database\Eloquent\Builder|Activity newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|Activity newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|Activity query()
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereAccountId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereActivityTypeId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereClientContactId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereClientId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereCreditId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereExpenseId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereInvitationId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereInvoiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereIp($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereIsSystem($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereNotes($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity wherePaymentId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereProjectId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity wherePurchaseOrderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereQuoteId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereRecurringExpenseId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereRecurringInvoiceId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereRecurringQuoteId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereSubscriptionId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereTaskId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereTokenId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereVendorContactId($value)
* @method static \Illuminate\Database\Eloquent\Builder|Activity whereVendorId($value)
* @mixin \Eloquent
*/
class Activity extends StaticModel

38
app/Models/BankIntegration.php
View File

@ -27,11 +27,11 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property string|null $bank_account_number
* @property string|null $bank_account_status
* @property string|null $bank_account_type
* @property string $balance
* @property string|null $currency
* @property float $balance
* @property int|null $currency
* @property string $nickname
* @property string|null $from_date
* @property int $is_deleted
* @property bool $is_deleted
* @property int|null $created_at
* @property int|null $updated_at
* @property int|null $deleted_at
@ -52,41 +52,9 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration query()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereAccountId($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereAutoSync($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereBalance($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereBankAccountId($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereBankAccountName($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereBankAccountNumber($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereBankAccountStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereBankAccountType($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereCompanyId($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereCurrency($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereDisabledUpstream($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereFromDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereIsDeleted($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereNickname($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereProviderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereProviderName($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|BankIntegration withoutTrashed()
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\BankTransaction> $transactions
* @mixin \Eloquent
*/
class BankIntegration extends BaseModel

4
app/Models/BaseModel.php
View File

@ -41,9 +41,9 @@ use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundExceptio
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel newQuery($query)
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel query()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude(array $excludeable)
* @method static \Illuminate\Database\Eloquent\BaseModel withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scopeExclude($query)
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel find($value)
* @method static BaseModel find($value)
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel whereIn($query)
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel where($query)
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel count()

35
app/Models/CompanyGateway.php
View File

@ -21,14 +21,15 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property int $company_id
* @property int $user_id
* @property string $gateway_key
* @property int $accepted_credit_cards
* @property int $require_cvv
* @property int|null $require_billing_address
* @property int|null $require_shipping_address
* @property int|null $update_details
* @property int $is_deleted
* @property bool $accepted_credit_cards
* @property bool $require_cvv
* @property bool $require_billing_address
* @property bool $require_shipping_address
* @property bool $update_details
* @property bool $is_deleted
* @property string $config
* @property object $fees_and_limits
* @property mixed $fees_and_limits
* @property-write mixed $fees_and_limits
* @property string|null $custom_value1
* @property string|null $custom_value2
* @property string|null $custom_value3
@ -38,15 +39,15 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property int|null $deleted_at
* @property string $token_billing
* @property string|null $label
* @property int $require_client_name
* @property int $require_postal_code
* @property int $require_client_phone
* @property int $require_contact_name
* @property int $require_contact_email
* @property int $require_custom_value1
* @property int $require_custom_value2
* @property int $require_custom_value3
* @property int $require_custom_value4
* @property bool $require_client_name
* @property bool $require_postal_code
* @property bool $require_client_phone
* @property bool $require_contact_name
* @property bool $require_contact_email
* @property bool $require_custom_value1
* @property bool $require_custom_value2
* @property bool $require_custom_value3
* @property bool $require_custom_value4
* @property-read int|null $client_gateway_tokens_count
* @property-read \App\Models\Company $company
* @property-read \App\Models\Gateway $gateway
@ -61,7 +62,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel scope()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway withTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway withoutTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|CompanyGateway find()
* @method static CompanyGateway find()
* @property-read \Illuminate\Database\Eloquent\Collection<int, \App\Models\ClientGatewayToken> $client_gateway_tokens
* @mixin \Eloquent
*/

6
app/Models/CompanyToken.php
View File

@ -66,12 +66,12 @@ class CompanyToken extends BaseModel
return self::class;
}
public function account()
public function account(): \Illuminate\Database\Eloquent\Relations\BelongsTo
{
return $this->belongsTo(Account::class);
}
public function user()
public function user(): \Illuminate\Database\Eloquent\Relations\BelongsTo
{
return $this->belongsTo(User::class);
}
@ -81,7 +81,7 @@ class CompanyToken extends BaseModel
return $this->belongsTo(Company::class);
}
public function company_user()
public function company_user(): \Illuminate\Database\Eloquent\Relations\HasOne
{
return $this->hasOne(CompanyUser::class, 'user_id', 'user_id')
->where('company_id', $this->company_id)

2
app/Models/Invoice.php
View File

@ -122,7 +122,7 @@ use App\Events\Invoice\InvoiceReminderWasEmailed;
* @property-read int|null $tasks_count
* @property-read \App\Models\User $user
* @property-read \App\Models\Vendor|null $vendor
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel company()
* @method static \Illuminate\Database\Eloquent\Builder company()
* @method static \Illuminate\Database\Eloquent\Builder|BaseModel exclude($columns)
* @method static \Database\Factories\InvoiceFactory factory($count = null, $state = [])
* @method static \Illuminate\Database\Eloquent\Builder|Invoice filter(\App\Filters\QueryFilters $filters)

3
phpstan.neon
View File

@ -10,4 +10,5 @@ parameters:
- 'app/Console/Commands/*'
- 'app/DataMapper/Analytics/*'
universalObjectCratesClasses:
- App\DataMapper\Tax\RuleInterface
- App\DataMapper\Tax\RuleInterface
- App\DataMapper\FeesAndLimits