diff --git a/app/DataMapper/Tax/TaxData.php b/app/DataMapper/Tax/TaxData.php index 7ce386009553..cf9e47b27165 100644 --- a/app/DataMapper/Tax/TaxData.php +++ b/app/DataMapper/Tax/TaxData.php @@ -24,6 +24,7 @@ class TaxData public function __construct(public Response $origin) { + // @phpstan-ignore-next-line foreach($origin as $key => $value) { $this->{$key} = $value; } diff --git a/app/Http/Controllers/Auth/ContactLoginController.php b/app/Http/Controllers/Auth/ContactLoginController.php index e0f18daad76d..e3919647486b 100644 --- a/app/Http/Controllers/Auth/ContactLoginController.php +++ b/app/Http/Controllers/Auth/ContactLoginController.php @@ -167,17 +167,17 @@ class ContactLoginController extends Controller { if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_dashboard') === true) { $this->redirectTo = '/client/dashboard'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES)) { $this->redirectTo = '/client/invoices'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES)) { $this->redirectTo = '/client/recurring_invoices'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES)) { $this->redirectTo = '/client/quotes'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS)) { $this->redirectTo = '/client/credits'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS)) { $this->redirectTo = '/client/tasks'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES)) { $this->redirectTo = '/client/expenses'; } } diff --git a/app/Http/Controllers/ClientPortal/ContactHashLoginController.php b/app/Http/Controllers/ClientPortal/ContactHashLoginController.php index 944385c28ec2..d03e4cba3ab5 100644 --- a/app/Http/Controllers/ClientPortal/ContactHashLoginController.php +++ b/app/Http/Controllers/ClientPortal/ContactHashLoginController.php @@ -66,15 +66,15 @@ class ContactHashLoginController extends Controller { if (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) { return '/client/invoices'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES)) { return '/client/recurring_invoices'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES)) { return '/client/quotes'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS)) { return '/client/credits'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS)) { return '/client/tasks'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES)) { return '/client/expenses'; } } diff --git a/app/Http/Controllers/CreditController.php b/app/Http/Controllers/CreditController.php index 5d02ed881ede..63c419cff84f 100644 --- a/app/Http/Controllers/CreditController.php +++ b/app/Http/Controllers/CreditController.php @@ -458,7 +458,7 @@ class CreditController extends BaseController /** * Perform bulk actions on the list view. * - * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response * * @OA\Post( * path="/api/v1/credits/bulk", @@ -700,7 +700,7 @@ class CreditController extends BaseController * ), * ) * @param $invitation_key - * @return \Symfony\Component\HttpFoundation\StreamedResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response */ public function downloadPdf($invitation_key) { @@ -768,7 +768,7 @@ class CreditController extends BaseController * ), * ) * @param $invitation_key - * @return \Symfony\Component\HttpFoundation\BinaryFileResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response */ public function downloadECredit($invitation_key) { diff --git a/app/Http/Controllers/FilterController.php b/app/Http/Controllers/FilterController.php index b80188659f05..ca03b5b3e309 100644 --- a/app/Http/Controllers/FilterController.php +++ b/app/Http/Controllers/FilterController.php @@ -24,7 +24,7 @@ class FilterController extends BaseController /** * Display a listing of the resource. * - * @return void + * @return \Illuminate\Http\JsonResponse */ public function index(Request $request, string $entity) { diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index ec74c7597086..84f25f501828 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -800,7 +800,7 @@ class InvoiceController extends BaseController * ), * ) * @param $invitation_key - * @return \Symfony\Component\HttpFoundation\BinaryFileResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response */ public function downloadPdf($invitation_key) { @@ -870,7 +870,7 @@ class InvoiceController extends BaseController * ), * ) * @param $invitation_key - * @return \Symfony\Component\HttpFoundation\BinaryFileResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response */ public function downloadEInvoice($invitation_key) { @@ -938,7 +938,7 @@ class InvoiceController extends BaseController * ), * ) * @param $invoice - * @return \Symfony\Component\HttpFoundation\BinaryFileResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response */ public function deliveryNote(ShowInvoiceRequest $request, Invoice $invoice) { diff --git a/app/Http/Controllers/PreviewPurchaseOrderController.php b/app/Http/Controllers/PreviewPurchaseOrderController.php index a856015320d0..d6279868223b 100644 --- a/app/Http/Controllers/PreviewPurchaseOrderController.php +++ b/app/Http/Controllers/PreviewPurchaseOrderController.php @@ -54,7 +54,7 @@ class PreviewPurchaseOrderController extends BaseController /** * Returns a template filled with entity variables. * - * @return \Illuminate\Http\Response + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response | \Symfony\Component\HttpFoundation\BinaryFileResponse * * @OA\Post( * path="/api/v1/preview/purchase_order", diff --git a/app/Http/Controllers/PurchaseOrderController.php b/app/Http/Controllers/PurchaseOrderController.php index 2a55a084fd2e..8fc2228d492f 100644 --- a/app/Http/Controllers/PurchaseOrderController.php +++ b/app/Http/Controllers/PurchaseOrderController.php @@ -434,7 +434,7 @@ class PurchaseOrderController extends BaseController /** * Perform bulk actions on the list view. * - * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response | \Symfony\Component\HttpFoundation\BinaryFileResponse * * @OA\Post( * path="/api/v1/purchase_orders/bulk", @@ -826,7 +826,7 @@ class PurchaseOrderController extends BaseController * ), * ) * @param $invitation_key - * @return \Symfony\Component\HttpFoundation\BinaryFileResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response */ public function downloadPdf($invitation_key) { @@ -891,7 +891,7 @@ class PurchaseOrderController extends BaseController * ), * ) * @param $invitation_key - * @return \Symfony\Component\HttpFoundation\BinaryFileResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response */ public function downloadEPurchaseOrder($invitation_key) { diff --git a/app/Http/Controllers/QuoteController.php b/app/Http/Controllers/QuoteController.php index 3a03350406ac..38c5ba2d2ba5 100644 --- a/app/Http/Controllers/QuoteController.php +++ b/app/Http/Controllers/QuoteController.php @@ -465,7 +465,7 @@ class QuoteController extends BaseController /** * Perform bulk actions on the list view. * - * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response * * * @OA\Post( @@ -832,7 +832,7 @@ class QuoteController extends BaseController * ), * ) * @param $invitation_key - * @return \Symfony\Component\HttpFoundation\BinaryFileResponse + * @return \Symfony\Component\HttpFoundation\StreamedResponse | \Illuminate\Http\JsonResponse | \Illuminate\Http\Response | \Symfony\Component\HttpFoundation\BinaryFileResponse */ public function downloadPdf($invitation_key) diff --git a/app/Http/Controllers/Traits/VerifiesUserEmail.php b/app/Http/Controllers/Traits/VerifiesUserEmail.php index 42e134c89b8e..a1d2bdae0638 100644 --- a/app/Http/Controllers/Traits/VerifiesUserEmail.php +++ b/app/Http/Controllers/Traits/VerifiesUserEmail.php @@ -28,7 +28,7 @@ trait VerifiesUserEmail use MakesHash; /** - * @return \Illuminate\Http\RedirectResponse + * @return \Illuminate\View\View */ public function confirm() { diff --git a/app/Http/Controllers/VendorPortal/VendorContactHashLoginController.php b/app/Http/Controllers/VendorPortal/VendorContactHashLoginController.php index 06ad854e52a3..b0464fb5a65f 100644 --- a/app/Http/Controllers/VendorPortal/VendorContactHashLoginController.php +++ b/app/Http/Controllers/VendorPortal/VendorContactHashLoginController.php @@ -19,7 +19,7 @@ class VendorContactHashLoginController extends Controller /** * Logs a user into the client portal using their contact_key * @param string $contact_key The contact key - * @return Auth|\Illuminate\Support\Facades\Redirect + * @return \Illuminate\Http\RedirectResponse */ public function login(string $contact_key) { @@ -27,14 +27,19 @@ class VendorContactHashLoginController extends Controller } /** - * @return \Illuminate\Support\Facades\Redirect + * @return \Illuminate\Http\RedirectResponse */ public function magicLink(string $magic_link) { return redirect($this->setRedirectPath()); } - + + /** + * errorPage + * + * @return \Illuminate\View\View + */ public function errorPage() { return render('generic.error', ['title' => session()->get('title'), 'notification' => session()->get('notification')]); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 06d43528a636..3f9a1f05fd29 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -65,7 +65,7 @@ class Kernel extends HttpKernel * * These middleware are run during every request to your application. * - * @var array + * @var array */ protected $middleware = [ CheckForMaintenanceMode::class, @@ -79,7 +79,7 @@ class Kernel extends HttpKernel /** * The application's route middleware groups. * - * @var array + * @var array> */ protected $middlewareGroups = [ 'web' => [ @@ -125,7 +125,7 @@ class Kernel extends HttpKernel * * These middleware may be assigned to groups or used individually. * - * @var array + * @var array */ protected $middlewareAliases = [ 'auth' => Authenticate::class, diff --git a/app/Http/Middleware/CheckForMaintenanceMode.php b/app/Http/Middleware/CheckForMaintenanceMode.php index b3e8116160d6..071a8670ca12 100644 --- a/app/Http/Middleware/CheckForMaintenanceMode.php +++ b/app/Http/Middleware/CheckForMaintenanceMode.php @@ -18,7 +18,7 @@ class CheckForMaintenanceMode extends Middleware /** * The URIs that should be reachable while maintenance mode is enabled. * - * @var array + * @var array */ protected $except = [ // diff --git a/app/Http/Middleware/ContactKeyLogin.php b/app/Http/Middleware/ContactKeyLogin.php index a35c4f351642..9485678156ec 100644 --- a/app/Http/Middleware/ContactKeyLogin.php +++ b/app/Http/Middleware/ContactKeyLogin.php @@ -163,17 +163,17 @@ class ContactKeyLogin { if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_dashboard') === true) { return '/client/dashboard'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES)) { return '/client/invoices'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES)) { return '/client/recurring_invoices'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES)) { return '/client/quotes'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS)) { return '/client/credits'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_TASKS)) { return '/client/tasks'; - } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES) { + } elseif ((bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_EXPENSES)) { return '/client/expenses'; } } diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php index 6816bede7250..48f9a65fd4d6 100644 --- a/app/Http/Middleware/EncryptCookies.php +++ b/app/Http/Middleware/EncryptCookies.php @@ -18,7 +18,7 @@ class EncryptCookies extends Middleware /** * The names of the cookies that should not be encrypted. * - * @var array + * @var array */ protected $except = [ // diff --git a/app/Http/Middleware/ThrottleRequestsWithPredis.php b/app/Http/Middleware/ThrottleRequestsWithPredis.php index ec16ad695a66..365cdad1929d 100644 --- a/app/Http/Middleware/ThrottleRequestsWithPredis.php +++ b/app/Http/Middleware/ThrottleRequestsWithPredis.php @@ -12,7 +12,7 @@ class ThrottleRequestsWithPredis extends ThrottleRequests /** * The Redis factory implementation. * - * @var \Illuminate\Contracts\Redis\Factory + * @var \Illuminate\Redis\Connections\Connection */ protected $redis; diff --git a/app/Http/Middleware/TrimStrings.php b/app/Http/Middleware/TrimStrings.php index 039c8b7fb806..8281092925ee 100644 --- a/app/Http/Middleware/TrimStrings.php +++ b/app/Http/Middleware/TrimStrings.php @@ -18,7 +18,7 @@ class TrimStrings extends Middleware /** * The names of the attributes that should not be trimmed. * - * @var array + * @var array */ protected $except = [ 'current_password', diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index efafaa27ccc6..464743ca5fd6 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -20,7 +20,7 @@ class TrustProxies extends Middleware /** * The trusted proxies for this application. * - * @var array + * @var array */ protected $proxies; diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index b2139e5fe67d..c0fb770cd97d 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -25,7 +25,7 @@ class VerifyCsrfToken extends Middleware /** * The URIs that should be excluded from CSRF verification. * - * @var array + * @var array */ protected $except = [ 'setup/*', diff --git a/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php b/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php index 19abb31bd009..8de2c43a0006 100644 --- a/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php +++ b/app/Http/Requests/ClientPortal/Credits/ShowCreditRequest.php @@ -17,7 +17,7 @@ class ShowCreditRequest extends FormRequest auth()->guard('contact')->user()->loadMissing(['company']); return ! $this->credit->is_deleted - && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS + && (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS) && auth()->guard('contact')->user()->client_id === $this->credit->client_id; } diff --git a/app/Http/Requests/ClientPortal/Credits/ShowCreditsRequest.php b/app/Http/Requests/ClientPortal/Credits/ShowCreditsRequest.php index 0cfc44eae024..cd83a8a1193f 100644 --- a/app/Http/Requests/ClientPortal/Credits/ShowCreditsRequest.php +++ b/app/Http/Requests/ClientPortal/Credits/ShowCreditsRequest.php @@ -19,7 +19,7 @@ class ShowCreditsRequest extends FormRequest { public function authorize() { - return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS; + return (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_CREDITS); } public function rules() diff --git a/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php b/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php index 59469b2f891f..2cc008636e39 100644 --- a/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php +++ b/app/Http/Requests/ClientPortal/Invoices/ProcessInvoicesInBulkRequest.php @@ -22,7 +22,7 @@ class ProcessInvoicesInBulkRequest extends FormRequest auth()->guard('contact')->user()->loadMissing(['company']); - return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES; + return (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES); } public function rules() diff --git a/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php b/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php index 27c55d602a4a..16d328f496e7 100644 --- a/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php +++ b/app/Http/Requests/ClientPortal/Invoices/ShowInvoiceRequest.php @@ -27,6 +27,6 @@ class ShowInvoiceRequest extends Request auth()->guard('contact')->user()->loadMissing(['company']); return (int) auth()->guard('contact')->user()->client_id === (int) $this->invoice->client_id - && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES; + && (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES); } } diff --git a/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php b/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php index 872da16d6699..25e2d1817f2e 100644 --- a/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php +++ b/app/Http/Requests/ClientPortal/Invoices/ShowInvoicesRequest.php @@ -22,7 +22,7 @@ class ShowInvoicesRequest extends FormRequest auth()->guard('contact')->user()->loadMissing(['company']); - return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES; + return (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES); } public function rules() diff --git a/app/Http/Requests/ClientPortal/PrePayments/StorePrePaymentRequest.php b/app/Http/Requests/ClientPortal/PrePayments/StorePrePaymentRequest.php index 5a5c8d7be439..6b5ab0c4f95a 100644 --- a/app/Http/Requests/ClientPortal/PrePayments/StorePrePaymentRequest.php +++ b/app/Http/Requests/ClientPortal/PrePayments/StorePrePaymentRequest.php @@ -22,7 +22,7 @@ class StorePrePaymentRequest extends FormRequest $query->without('gateway_tokens', 'documents', 'contacts.company', 'contacts'); // Exclude 'grandchildren' relation of 'client' }]); - return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES; + return (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES); } /** diff --git a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php index 502eb5d3c3a8..72a7cc9a664e 100644 --- a/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php +++ b/app/Http/Requests/ClientPortal/Quotes/ProcessQuotesInBulkRequest.php @@ -24,7 +24,7 @@ class ProcessQuotesInBulkRequest extends FormRequest auth()->guard('contact')->user()->loadMissing(['company']); - return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES; + return (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES); } public function rules() diff --git a/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php b/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php index 7643ec213e68..d5203b029832 100644 --- a/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php +++ b/app/Http/Requests/ClientPortal/Quotes/ShowQuoteRequest.php @@ -22,8 +22,8 @@ class ShowQuoteRequest extends FormRequest auth()->guard('contact')->user()->loadMissing(['company']); - return auth()->guard('contact')->user()->client->id === (int) $this->quote->client_id - && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES; + return (int)auth()->guard('contact')->user()->client->id === (int) $this->quote->client_id + && (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES); } public function rules() diff --git a/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php b/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php index 87f4ccd70d9b..9f62924e027c 100644 --- a/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php +++ b/app/Http/Requests/ClientPortal/Quotes/ShowQuotesRequest.php @@ -22,7 +22,7 @@ class ShowQuotesRequest extends FormRequest auth()->guard('contact')->user()->loadMissing(['company']); - return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES; + return (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_QUOTES); } public function rules() diff --git a/app/Http/Requests/ClientPortal/RecurringInvoices/RequestCancellationRequest.php b/app/Http/Requests/ClientPortal/RecurringInvoices/RequestCancellationRequest.php index 418c91493950..eacd6112dca3 100644 --- a/app/Http/Requests/ClientPortal/RecurringInvoices/RequestCancellationRequest.php +++ b/app/Http/Requests/ClientPortal/RecurringInvoices/RequestCancellationRequest.php @@ -12,7 +12,7 @@ class RequestCancellationRequest extends FormRequest auth()->guard('contact')->user()->loadMissing(['company']); - return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES; + return (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES); } public function rules() diff --git a/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php b/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php index a060215d8baa..ac19bea4edf6 100644 --- a/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php +++ b/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoiceRequest.php @@ -20,8 +20,8 @@ class ShowRecurringInvoiceRequest extends Request { auth()->guard('contact')->user()->loadMissing(['company']); - return auth()->guard('contact')->user()->client->id == $this->recurring_invoice->client_id - && auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES; + return (int)auth()->guard('contact')->user()->client->id == $this->recurring_invoice->client_id + && (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES); } public function rules() diff --git a/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoicesRequest.php b/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoicesRequest.php index 5cde35b30c2c..fde2de70ad21 100644 --- a/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoicesRequest.php +++ b/app/Http/Requests/ClientPortal/RecurringInvoices/ShowRecurringInvoicesRequest.php @@ -21,7 +21,7 @@ class ShowRecurringInvoicesRequest extends FormRequest { auth()->guard('contact')->user()->loadMissing(['company']); - return auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES; + return (bool)(auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES); } public function rules() diff --git a/app/Http/Requests/Gateways/GoCardless/IbpRequest.php b/app/Http/Requests/Gateways/GoCardless/IbpRequest.php index dc16c6196487..4a97add18787 100644 --- a/app/Http/Requests/Gateways/GoCardless/IbpRequest.php +++ b/app/Http/Requests/Gateways/GoCardless/IbpRequest.php @@ -50,21 +50,25 @@ class IbpRequest extends FormRequest public function getCompany(): ?Company { + /** @var \App\Models\Company */ return Company::where('company_key', $this->company_key)->first(); } public function getCompanyGateway(): ?CompanyGateway { + /** @var \App\Models\CompanyGateway */ return CompanyGateway::find($this->decodePrimaryKey($this->company_gateway_id)); } public function getPaymentHash(): ?PaymentHash { + /** @var \App\Models\PaymentHash */ return PaymentHash::where('hash', $this->hash)->firstOrFail(); } public function getClient(): ?Client { + /** @var \App\Models\Client */ return Client::find($this->getPaymentHash()->data->client_id); } } diff --git a/app/Http/Requests/Gateways/Mollie/Mollie3dsRequest.php b/app/Http/Requests/Gateways/Mollie/Mollie3dsRequest.php index 3408c2280802..7251433670b2 100644 --- a/app/Http/Requests/Gateways/Mollie/Mollie3dsRequest.php +++ b/app/Http/Requests/Gateways/Mollie/Mollie3dsRequest.php @@ -47,21 +47,25 @@ class Mollie3dsRequest extends FormRequest public function getCompany(): ?Company { + /** @var \App\Models\Company */ return Company::where('company_key', $this->company_key)->first(); } public function getCompanyGateway(): ?CompanyGateway { + /** @var \App\Models\CompanyGateway */ return CompanyGateway::find($this->decodePrimaryKey($this->company_gateway_id)); } public function getPaymentHash(): ?PaymentHash { + /** @var \App\Models\PaymentHash */ return PaymentHash::where('hash', $this->hash)->first(); } public function getClient(): ?Client { + /** @var \App\Models\Client */ return Client::find($this->getPaymentHash()->data->client_id); } diff --git a/app/Http/Requests/Payment/RefundPaymentRequest.php b/app/Http/Requests/Payment/RefundPaymentRequest.php index 2cee811ea878..75171f27b0e2 100644 --- a/app/Http/Requests/Payment/RefundPaymentRequest.php +++ b/app/Http/Requests/Payment/RefundPaymentRequest.php @@ -81,7 +81,7 @@ class RefundPaymentRequest extends Request public function payment(): ?\App\Models\Payment { $input = $this->all(); - - return Payment::whereId($input['id'])->first(); + /** @var \App\Models\Payment */ + return Payment::find($input['id']); } } diff --git a/app/Http/Requests/Payments/PaymentWebhookRequest.php b/app/Http/Requests/Payments/PaymentWebhookRequest.php index 78b840680d43..765f681f508f 100644 --- a/app/Http/Requests/Payments/PaymentWebhookRequest.php +++ b/app/Http/Requests/Payments/PaymentWebhookRequest.php @@ -45,19 +45,21 @@ class PaymentWebhookRequest extends Request { MultiDB::findAndSetDbByCompanyKey($this->company_key); + /** @var \App\Models\CompanyGateway */ return CompanyGateway::withTrashed()->find($this->decodePrimaryKey($this->company_gateway_id)); } /** * Resolve payment hash. * - * @return null|\App\Models\PaymentHash + * @return null|bool|\App\Models\PaymentHash */ public function getPaymentHash() { if ($this->query('hash')) { MultiDB::findAndSetDbByCompanyKey($this->company_key); + /** @var \App\Models\PaymentHash */ return PaymentHash::where('hash', $this->query('hash'))->firstOrFail(); } @@ -72,7 +74,8 @@ class PaymentWebhookRequest extends Request public function getCompany(): ?Company { MultiDB::findAndSetDbByCompanyKey($this->company_key); - + + /** @var \App\Models\Company */ return Company::where('company_key', $this->company_key)->firstOrFail(); } } diff --git a/app/Http/Requests/VendorPortal/Documents/ShowDocumentRequest.php b/app/Http/Requests/VendorPortal/Documents/ShowDocumentRequest.php index 877e6e58a26c..c729d35adc38 100644 --- a/app/Http/Requests/VendorPortal/Documents/ShowDocumentRequest.php +++ b/app/Http/Requests/VendorPortal/Documents/ShowDocumentRequest.php @@ -27,9 +27,8 @@ class ShowDocumentRequest extends FormRequest public function authorize() { - /** @var \App\Models\VendorContact auth()->guard('vendor')->user() */ - return auth()->guard('vendor')->user()->vendor_id == $this->document->documentable_id - || $this->document->company_id == auth()->guard('vendor')->user()->company_id; + return (bool) (auth()->guard('vendor')->user()->vendor_id == $this->document->documentable_id + || $this->document->company_id == auth()->guard('vendor')->user()->company_id); } /** diff --git a/app/Http/Requests/VendorPortal/PurchaseOrders/ProcessPurchaseOrdersInBulkRequest.php b/app/Http/Requests/VendorPortal/PurchaseOrders/ProcessPurchaseOrdersInBulkRequest.php index 598f92e238a4..ea832b8f57ea 100644 --- a/app/Http/Requests/VendorPortal/PurchaseOrders/ProcessPurchaseOrdersInBulkRequest.php +++ b/app/Http/Requests/VendorPortal/PurchaseOrders/ProcessPurchaseOrdersInBulkRequest.php @@ -19,7 +19,7 @@ class ProcessPurchaseOrdersInBulkRequest extends FormRequest { public function authorize() { - return auth()->guard('vendor')->user()->vendor->company->enabled_modules & PortalComposer::MODULE_PURCHASE_ORDERS; + return (bool)(auth()->guard('vendor')->user()->vendor->company->enabled_modules & PortalComposer::MODULE_PURCHASE_ORDERS); } public function rules() diff --git a/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrderRequest.php b/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrderRequest.php index f204925b9130..30c06de393e8 100644 --- a/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrderRequest.php +++ b/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrderRequest.php @@ -24,6 +24,6 @@ class ShowPurchaseOrderRequest extends Request public function authorize(): bool { return (int) auth()->guard('vendor')->user()->vendor_id === (int) $this->purchase_order->vendor_id - && auth()->guard('vendor')->user()->company->enabled_modules & PortalComposer::MODULE_PURCHASE_ORDERS; + && (bool)(auth()->guard('vendor')->user()->company->enabled_modules & PortalComposer::MODULE_PURCHASE_ORDERS); } } diff --git a/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrdersRequest.php b/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrdersRequest.php index 3c58f1df85bc..1c0e78e7b5dc 100644 --- a/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrdersRequest.php +++ b/app/Http/Requests/VendorPortal/PurchaseOrders/ShowPurchaseOrdersRequest.php @@ -23,6 +23,6 @@ class ShowPurchaseOrdersRequest extends Request */ public function authorize(): bool { - return auth()->guard('vendor')->user()->company->enabled_modules & PortalComposer::MODULE_PURCHASE_ORDERS; + return (bool)(auth()->guard('vendor')->user()->company->enabled_modules & PortalComposer::MODULE_PURCHASE_ORDERS); } } diff --git a/app/Http/ValidationRules/Project/ValidProjectForClient.php b/app/Http/ValidationRules/Project/ValidProjectForClient.php index 01a22c7fdaa5..0cf2c4a0ac2b 100644 --- a/app/Http/ValidationRules/Project/ValidProjectForClient.php +++ b/app/Http/ValidationRules/Project/ValidProjectForClient.php @@ -44,13 +44,11 @@ class ValidProjectForClient implements Rule return true; } - - $project = Project::withTrashed()->find($this->input['project_id']); if (! $project) { $this->message = 'Project not found'; - return; + return false; } if(!isset($this->input['client_id'])) { diff --git a/app/Jobs/Brevo/ProcessBrevoWebhook.php b/app/Jobs/Brevo/ProcessBrevoWebhook.php index c8704cf163dd..e6ef60a7522d 100644 --- a/app/Jobs/Brevo/ProcessBrevoWebhook.php +++ b/app/Jobs/Brevo/ProcessBrevoWebhook.php @@ -55,6 +55,8 @@ class ProcessBrevoWebhook implements ShouldQueue 'events' => [], ]; + + /** @var ?\App\Models\Company $company*/ private ?Company $company = null; /** @@ -86,11 +88,12 @@ class ProcessBrevoWebhook implements ShouldQueue * Execute the job. * * - * @return void */ public function handle() { MultiDB::findAndSetDbByCompanyKey($this->request['tags'][0]); + + /** @phpstan-ignore-next-line */ $this->company = Company::where('company_key', $this->request['tags'][0])->first(); $this->invitation = $this->discoverInvitation($this->request['message-id']); diff --git a/app/Jobs/Company/CompanyExport.php b/app/Jobs/Company/CompanyExport.php index 2ebdf57dcdfc..4f7c571ec4ed 100644 --- a/app/Jobs/Company/CompanyExport.php +++ b/app/Jobs/Company/CompanyExport.php @@ -63,7 +63,6 @@ class CompanyExport implements ShouldQueue /** * Execute the job. * - * @return void */ public function handle() { @@ -468,10 +467,10 @@ class CompanyExport implements ShouldQueue $x->addItems($this->export_data['subscriptions']); $this->export_data = null; + $this->export_data['system_logs'] = $this->company->system_logs->map(function ($log) { - $log->client_id = $this->encodePrimaryKey($log->client_id); - $log->company_id = $this->encodePrimaryKey($log->company_id); - + $log->client_id = $this->encodePrimaryKey($log->client_id);/** @phpstan-ignore-line */ + $log->company_id = $this->encodePrimaryKey($log->company_id);/** @phpstan-ignore-line */ return $log; })->makeHidden(['id'])->all(); @@ -496,9 +495,9 @@ class CompanyExport implements ShouldQueue $this->export_data['task_statuses'] = $this->company->task_statuses->map(function ($status) { - $status->id = $this->encodePrimaryKey($status->id); - $status->user_id = $this->encodePrimaryKey($status->user_id); - $status->company_id = $this->encodePrimaryKey($status->company_id); + $status->id = $this->encodePrimaryKey($status->id); /** @phpstan-ignore-line */ + $status->user_id = $this->encodePrimaryKey($status->user_id);/** @phpstan-ignore-line */ + $status->company_id = $this->encodePrimaryKey($status->company_id); /** @phpstan-ignore-line */ return $status; })->all(); @@ -511,8 +510,9 @@ class CompanyExport implements ShouldQueue $this->export_data['tax_rates'] = $this->company->tax_rates->map(function ($rate) { - $rate->company_id = $this->encodePrimaryKey($rate->company_id); - $rate->user_id = $this->encodePrimaryKey($rate->user_id); + $rate->company_id = $this->encodePrimaryKey($rate->company_id); /** @phpstan-ignore-line */ + $rate->user_id = $this->encodePrimaryKey($rate->user_id); /** @phpstan-ignore-line */ + return $rate; })->makeHidden(['id'])->all(); @@ -550,9 +550,8 @@ class CompanyExport implements ShouldQueue $this->export_data['webhooks'] = $this->company->webhooks->map(function ($hook) { - $hook->user_id = $this->encodePrimaryKey($hook->user_id); - $hook->company_id = $this->encodePrimaryKey($hook->company_id); - + $hook->user_id = $this->encodePrimaryKey($hook->user_id);/** @phpstan-ignore-line */ + $hook->company_id = $this->encodePrimaryKey($hook->company_id);/** @phpstan-ignore-line */ return $hook; })->makeHidden(['id'])->all(); diff --git a/app/Jobs/Company/CompanyImport.php b/app/Jobs/Company/CompanyImport.php index 3a60741a82d9..f52ce435b5b9 100644 --- a/app/Jobs/Company/CompanyImport.php +++ b/app/Jobs/Company/CompanyImport.php @@ -417,7 +417,7 @@ class CompanyImport implements ShouldQueue * import to start if there are users > plan number * due to entity user_id dependencies * - * @return bool + * @return self */ private function checkUserCount() { diff --git a/app/Jobs/Cron/UpdateCalculatedFields.php b/app/Jobs/Cron/UpdateCalculatedFields.php index b25d88fa56f3..5f8bbc31a2bc 100644 --- a/app/Jobs/Cron/UpdateCalculatedFields.php +++ b/app/Jobs/Cron/UpdateCalculatedFields.php @@ -96,7 +96,7 @@ class UpdateCalculatedFields }); - return round(($duration / 60 / 60), 0); + return (int) round(($duration / 60 / 60), 0); } } diff --git a/app/Jobs/Invitation/MarkOpened.php b/app/Jobs/Invitation/MarkOpened.php index 798c84c56792..4194ab2b2edf 100644 --- a/app/Jobs/Invitation/MarkOpened.php +++ b/app/Jobs/Invitation/MarkOpened.php @@ -48,8 +48,6 @@ class MarkOpened implements ShouldQueue /** * Execute the job. * - * - * @return void */ public function handle() { diff --git a/app/Jobs/Invoice/CreateUbl.php b/app/Jobs/Invoice/CreateUbl.php index fcf450992976..167018736f7e 100644 --- a/app/Jobs/Invoice/CreateUbl.php +++ b/app/Jobs/Invoice/CreateUbl.php @@ -52,7 +52,6 @@ class CreateUbl implements ShouldQueue /** * Execute the job - * @return ?string */ public function handle() { diff --git a/app/Jobs/Mail/NinjaMailerJob.php b/app/Jobs/Mail/NinjaMailerJob.php index dbcf47bf2068..0326f34effbe 100644 --- a/app/Jobs/Mail/NinjaMailerJob.php +++ b/app/Jobs/Mail/NinjaMailerJob.php @@ -669,7 +669,7 @@ class NinjaMailerJob implements ShouldQueue * just for this request. */ - $token = $user->oauth_user_token->access_token; + $token = $user->oauth_user_token->access_token; /** @phpstan-ignore-line */ if (!$token) { $this->company->account->gmailCredentialNotification(); diff --git a/app/Jobs/Mailgun/ProcessMailgunWebhook.php b/app/Jobs/Mailgun/ProcessMailgunWebhook.php index e877e47a16e8..62f400a2bf04 100644 --- a/app/Jobs/Mailgun/ProcessMailgunWebhook.php +++ b/app/Jobs/Mailgun/ProcessMailgunWebhook.php @@ -84,9 +84,6 @@ class ProcessMailgunWebhook implements ShouldQueue /** * Execute the job. - * - * - * @return void */ public function handle() { diff --git a/app/Jobs/Payment/EmailRefundPayment.php b/app/Jobs/Payment/EmailRefundPayment.php index 0c88dfcdb9d0..f98ace737dd2 100644 --- a/app/Jobs/Payment/EmailRefundPayment.php +++ b/app/Jobs/Payment/EmailRefundPayment.php @@ -55,8 +55,6 @@ class EmailRefundPayment implements ShouldQueue /** * Execute the job. * - * - * @return void */ public function handle() { diff --git a/app/Jobs/PostMark/ProcessPostmarkWebhook.php b/app/Jobs/PostMark/ProcessPostmarkWebhook.php index 07ebd194bf85..5f56945a2dbd 100644 --- a/app/Jobs/PostMark/ProcessPostmarkWebhook.php +++ b/app/Jobs/PostMark/ProcessPostmarkWebhook.php @@ -83,13 +83,11 @@ class ProcessPostmarkWebhook implements ShouldQueue /** * Execute the job. * - * - * @return void */ public function handle() { MultiDB::findAndSetDbByCompanyKey($this->request['Tag']); - $this->company = Company::where('company_key', $this->request['Tag'])->first(); + $this->company = Company::where('company_key', $this->request['Tag'])->first(); /** @phpstan-ignore-line */ $this->invitation = $this->discoverInvitation($this->request['MessageID']); diff --git a/app/Models/Account.php b/app/Models/Account.php index b5bf09320dbc..c87be8b95d6a 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -59,7 +59,7 @@ use Laracasts\Presenter\PresentableTrait; * @property int|null $trial_duration * @property int $is_onboarding * @property object|null $onboarding - * @property int $is_migrated + * @property bool $is_migrated * @property string|null $platform * @property int|null $hosted_client_count * @property int|null $hosted_company_count diff --git a/app/Models/Client.php b/app/Models/Client.php index d67c3593f81a..c25df2f99419 100644 --- a/app/Models/Client.php +++ b/app/Models/Client.php @@ -110,7 +110,7 @@ use Laracasts\Presenter\PresentableTrait; * @property string $payment_balance * @property mixed $tax_data * @property int $is_tax_exempt - * @property int $has_valid_vat_number + * @property bool $has_valid_vat_number * @mixin \Eloquent */ class Client extends BaseModel implements HasLocalePreference diff --git a/app/Models/PaymentHash.php b/app/Models/PaymentHash.php index 1396b89aaf6c..5e0599ad9e0d 100644 --- a/app/Models/PaymentHash.php +++ b/app/Models/PaymentHash.php @@ -20,7 +20,7 @@ use Illuminate\Database\Eloquent\Model; * @property string $hash 32 char length AlphaNum * @property float $fee_total * @property int|null $fee_invoice_id - * @property \stdClass $data + * @property \stdClass|array $data * @property int|null $payment_id * @property \Illuminate\Support\Carbon|null $created_at * @property \Illuminate\Support\Carbon|null $updated_at diff --git a/app/Models/RecurringInvoice.php b/app/Models/RecurringInvoice.php index 097d53b302b4..d236054c35f8 100644 --- a/app/Models/RecurringInvoice.php +++ b/app/Models/RecurringInvoice.php @@ -41,7 +41,7 @@ use Laracasts\Presenter\PresentableTrait; * @property string|null $due_date * @property bool $is_deleted * @property array $line_items - * @property object|null $backup + * @property object|string|null $backup * @property string|null $footer * @property string|null $public_notes * @property string|null $private_notes diff --git a/app/Models/Task.php b/app/Models/Task.php index 5875680fbec8..87a63d0da2dd 100644 --- a/app/Models/Task.php +++ b/app/Models/Task.php @@ -43,7 +43,7 @@ use Illuminate\Support\Carbon; * @property bool $is_running * @property string|null $time_log * @property string|null $number - * @property string $rate + * @property float $rate * @property bool $invoice_documents * @property int $is_date_based * @property int|null $status_order diff --git a/app/Models/User.php b/app/Models/User.php index 2b710df48a22..102c4625c502 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -49,7 +49,7 @@ use Laracasts\Presenter\PresentableTrait; * @property int|null $failed_logins * @property string|null $referral_code * @property string|null $oauth_user_id - * @property object|null $oauth_user_token + * @property object|array|null $oauth_user_token * @property string|null $oauth_provider_id * @property string|null $google_2fa_secret * @property string|null $accepted_terms_version @@ -69,7 +69,7 @@ use Laracasts\Presenter\PresentableTrait; * @property string|null $custom_value4 * @property int|null $created_at * @property int|null $updated_at - * @property int|null $deleted_at + * @property int|null|Carbon $deleted_at * @property string|null $oauth_user_refresh_token * @property string|null $last_confirmed_email_address * @property bool $has_password diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php index 687eb966477f..a07980508c5a 100644 --- a/app/Models/Vendor.php +++ b/app/Models/Vendor.php @@ -30,7 +30,7 @@ use Laracasts\Presenter\PresentableTrait; * @property int $user_id * @property int|null $assigned_user_id * @property int $company_id - * @property string|null $currency_id + * @property int|null $currency_id * @property string|null $name * @property string|null $address1 * @property string|null $address2 diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php index 0da689a3bfd5..4035021b7bfc 100644 --- a/app/Repositories/TaskRepository.php +++ b/app/Repositories/TaskRepository.php @@ -126,10 +126,10 @@ class TaskRepository extends BaseRepository $time_log[count($time_log) - 1][1] = time(); $task->is_running = false; } elseif ($data['action'] == 'offline') { - $task->is_running = $data['is_running'] ? 1 : 0; + $task->is_running = $data['is_running'] ? true : false; } } elseif (isset($data['is_running'])) { - $task->is_running = $data['is_running'] ? 1 : 0; + $task->is_running = $data['is_running'] ? true : false; } $task->calculated_start_date = $this->harvestStartDate($time_log, $task); diff --git a/app/Services/Pdf/PdfMock.php b/app/Services/Pdf/PdfMock.php index 9b7dc767807a..0173ab8c624e 100644 --- a/app/Services/Pdf/PdfMock.php +++ b/app/Services/Pdf/PdfMock.php @@ -114,38 +114,40 @@ class PdfMock case 'invoice': /** @var \App\Models\Invoice | \App\Models\Credit | \App\Models\Quote $entity */ $entity = Invoice::factory()->make(); - $entity->client = Client::factory()->make(['settings' => $settings]); + $entity->client = Client::factory()->make(['settings' => $settings]); //@phpstan-ignore-line $entity->client->setRelation('company', $this->company); - $entity->invitation = InvoiceInvitation::factory()->make(); + $entity->invitation = InvoiceInvitation::factory()->make(); //@phpstan-ignore-line break; case 'quote': /** @var \App\Models\Invoice | \App\Models\Credit | \App\Models\Quote $entity */ $entity = Quote::factory()->make(); - $entity->client = Client::factory()->make(['settings' => $settings]); + $entity->client = Client::factory()->make(['settings' => $settings]); //@phpstan-ignore-line $entity->client->setRelation('company', $this->company); - $entity->invitation = QuoteInvitation::factory()->make(); + $entity->invitation = QuoteInvitation::factory()->make(); //@phpstan-ignore-line break; case 'credit': /** @var \App\Models\Invoice | \App\Models\Credit | \App\Models\Quote $entity */ $entity = Credit::factory()->make(); - $entity->client = Client::factory()->make(['settings' => $settings]); + $entity->client = Client::factory()->make(['settings' => $settings]); //@phpstan-ignore-line $entity->client->setRelation('company', $this->company); - $entity->invitation = CreditInvitation::factory()->make(); + $entity->invitation = CreditInvitation::factory()->make(); //@phpstan-ignore-line break; case 'purchase_order': /** @var \App\Models\PurchaseOrder $entity */ $entity = PurchaseOrder::factory()->make(); // $entity->client = Client::factory()->make(['settings' => $settings]); - $entity->vendor = Vendor::factory()->make(); + $entity->vendor = Vendor::factory()->make(); /** @phpstan-ignore-line */ $entity->vendor->setRelation('company', $this->company); - $entity->invitation = PurchaseOrderInvitation::factory()->make(); + $entity->invitation = PurchaseOrderInvitation::factory()->make();/** @phpstan-ignore-line */ + break; case PurchaseOrder::class: /** @var \App\Models\PurchaseOrder $entity */ $entity = PurchaseOrder::factory()->make(); $entity->invitation = PurchaseOrderInvitation::factory()->make(); - $entity->vendor = Vendor::factory()->make(); + $entity->vendor = Vendor::factory()->make(); /** @phpstan-ignore-line */ + $entity->invitation->setRelation('company', $this->company); break; default: @@ -184,7 +186,7 @@ class PdfMock /** * getTaxMap * - * @return \Illuminate\Http\Response|\Illuminate\Http\JsonResponse + * @return \Illuminate\Support\Collection */ private function getTaxMap(): \Illuminate\Support\Collection { diff --git a/app/Services/Subscription/PaymentLinkService.php b/app/Services/Subscription/PaymentLinkService.php index 7e58a36bb88a..2d91260e7e2c 100644 --- a/app/Services/Subscription/PaymentLinkService.php +++ b/app/Services/Subscription/PaymentLinkService.php @@ -171,7 +171,7 @@ class PaymentLinkService } if (!$this->subscription->trial_enabled) { - return new \Exception("Trials are disabled for this product"); + throw new \Exception("Trials are disabled for this product"); } //create recurring invoice with start date = trial_duration + 1 day diff --git a/app/Services/Tax/Providers/ZipTax.php b/app/Services/Tax/Providers/ZipTax.php index 751204f79d38..d967f62ee2f1 100644 --- a/app/Services/Tax/Providers/ZipTax.php +++ b/app/Services/Tax/Providers/ZipTax.php @@ -57,9 +57,8 @@ class ZipTax implements TaxProviderInterface * callApi * * @param array $parameters - * @return Response| \Illuminate\Http\JsonResponse */ - private function callApi(array $parameters): Response + private function callApi(array $parameters) { return Http::retry(3, 1000)->withHeaders([])->get($this->endpoint, $parameters); diff --git a/app/Transformers/ProjectTransformer.php b/app/Transformers/ProjectTransformer.php index 3d8ddcc6402c..cdf5184219c6 100644 --- a/app/Transformers/ProjectTransformer.php +++ b/app/Transformers/ProjectTransformer.php @@ -54,7 +54,7 @@ class ProjectTransformer extends EntityTransformer return null; } - public function includeClient(Project $project): \League\Fractal\Resource\Item + public function includeClient(Project $project): ?\League\Fractal\Resource\Item { if (!$project->client) { diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index d63abf547a1c..3f34611e0d24 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -51,7 +51,7 @@ class HtmlEngine /** @var \App\Models\Company $company */ public $company; - /** @var \App\DataMapper\CompanySettings $settings **/ + /** @var \App\DataMapper\CompanySettings|\stdClass $settings **/ public $settings; public $entity_calc;