Merge pull request #179 from poowf/analysis-qyZkkN

Apply fixes from StyleCI
poowf · Feb 2, 2019 · c904ab7 · c904ab7
2 parents 84dbe7e + 862cf7e
commit c904ab7
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 3 deletions.
diff --git a/app/Policies/ClientPolicy.php b/app/Policies/ClientPolicy.php
@@ -34,6 +34,7 @@ public function index(User $user)
     public function view(User $user, Client $client)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($client->company_id) && $user->can('view-client', $client);
     }
 
@@ -60,6 +61,7 @@ public function create(User $user)
     public function update(User $user, Client $client)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($client->company_id) && $user->can('update-client', $client);
     }
 
@@ -74,6 +76,7 @@ public function update(User $user, Client $client)
     public function delete(User $user, Client $client)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($client->company_id) && $user->can('delete-client', $client);
     }
 }
diff --git a/app/Policies/CompanyAddressPolicy.php b/app/Policies/CompanyAddressPolicy.php
@@ -40,7 +40,8 @@ public function index(User $user)
     public function view(User $user, CompanyAddress $companyAddress)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
-        return $userCompanies->contains($companyAddress->company_id) &&  $user->can('view-company-address', $companyAddress);
+
+        return $userCompanies->contains($companyAddress->company_id) && $user->can('view-company-address', $companyAddress);
     }
 
     /**
@@ -66,7 +67,8 @@ public function create(User $user)
     public function update(User $user, CompanyAddress $companyAddress)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
-        return $userCompanies->contains($companyAddress->company_id) &&  $user->can('update-company-address', $companyAddress);
+
+        return $userCompanies->contains($companyAddress->company_id) && $user->can('update-company-address', $companyAddress);
     }
 
     /**
@@ -80,6 +82,7 @@ public function update(User $user, CompanyAddress $companyAddress)
     public function delete(User $user, CompanyAddress $companyAddress)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
-        return $userCompanies->contains($companyAddress->company_id) &&  $user->can('delete-company-address', $companyAddress);
+
+        return $userCompanies->contains($companyAddress->company_id) && $user->can('delete-company-address', $companyAddress);
     }
 }
diff --git a/app/Policies/CompanyPolicy.php b/app/Policies/CompanyPolicy.php
@@ -34,6 +34,7 @@ public function index(User $user)
     public function view(User $user, Company $company)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($company->id) && $user->can('view-company', $company);
     }
 
@@ -60,6 +61,7 @@ public function create(User $user)
     public function update(User $user, Company $company)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($company->id) && $user->can('update-company', $company);
     }
 
@@ -119,6 +121,7 @@ public function member(User $user, Company $company)
     public function settings(User $user, Company $company)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($company->id) && $user->can('update-company-settings', $company->settings);
     }
 
@@ -133,6 +136,7 @@ public function settings(User $user, Company $company)
     public function address(User $user, Company $company)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($company->id) && $user->can('update-company-address', $company->address);
     }
 }
diff --git a/app/Policies/CompanySettingPolicy.php b/app/Policies/CompanySettingPolicy.php
@@ -40,6 +40,7 @@ public function index(User $user)
     public function view(User $user, CompanySetting $companySettings)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($companySettings->company_id) && $user->can('view-company-settings', $companySettings);
     }
 
@@ -66,6 +67,7 @@ public function create(User $user)
     public function update(User $user, CompanySetting $companySettings)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($companySettings->company_id) && $user->can('update-company-settings', $companySettings);
     }
 
@@ -80,6 +82,7 @@ public function update(User $user, CompanySetting $companySettings)
     public function delete(User $user, CompanySetting $companySettings)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($companySettings->company_id) && $user->can('delete-company-settings', $companySettings);
     }
 }
diff --git a/app/Policies/CompanyUserRequestPolicy.php b/app/Policies/CompanyUserRequestPolicy.php
@@ -40,6 +40,7 @@ public function index(User $user)
     public function view(User $user, CompanyUserRequest $companyUserRequest)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($companyUserRequest->company_id) && $user->can('view-company-user-request', $companyUserRequest);
     }
 
@@ -66,6 +67,7 @@ public function create(User $user)
     public function update(User $user, CompanyUserRequest $companyUserRequest)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($companyUserRequest->company_id) && $user->can('update-company-user-request', $companyUserRequest);
     }
 
@@ -80,6 +82,7 @@ public function update(User $user, CompanyUserRequest $companyUserRequest)
     public function delete(User $user, CompanyUserRequest $companyUserRequest)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($companyUserRequest->company_id) && $user->can('delete-company-user-request', $companyUserRequest);
     }
 }
diff --git a/app/Policies/InvoiceItemPolicy.php b/app/Policies/InvoiceItemPolicy.php
@@ -35,6 +35,7 @@ public function index(User $user)
     public function view(User $user, InvoiceItem $invoiceItem)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($invoiceItem->invoice->company_id) && $user->can('view-invoice', Invoice::class);
     }
 
@@ -61,6 +62,7 @@ public function create(User $user)
     public function update(User $user, InvoiceItem $invoiceItem)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($invoiceItem->invoice->company_id) && $user->can('update-invoice', Invoice::class);
     }
 
@@ -75,6 +77,7 @@ public function update(User $user, InvoiceItem $invoiceItem)
     public function delete(User $user, InvoiceItem $invoiceItem)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($invoiceItem->invoice->company_id) && $user->can('delete-invoice', Invoice::class);
     }
 }
diff --git a/app/Policies/InvoicePolicy.php b/app/Policies/InvoicePolicy.php
@@ -34,6 +34,7 @@ public function index(User $user)
     public function view(User $user, Invoice $invoice)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($invoice->company_id) && $user->can('view-invoice', $invoice);
     }
 
@@ -60,6 +61,7 @@ public function create(User $user)
     public function update(User $user, Invoice $invoice)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($invoice->company_id) && $user->can('update-invoice', $invoice);
     }
 
@@ -74,6 +76,7 @@ public function update(User $user, Invoice $invoice)
     public function delete(User $user, Invoice $invoice)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($invoice->company_id) && $user->can('delete-invoice', $invoice);
     }
 }
diff --git a/app/Policies/ItemTemplatePolicy.php b/app/Policies/ItemTemplatePolicy.php
@@ -34,6 +34,7 @@ public function index(User $user)
     public function view(User $user, ItemTemplate $itemtemplate)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($itemtemplate->company_id) && $user->can('view-item-template', $itemtemplate);
     }
 
@@ -61,6 +62,7 @@ public function create(User $user)
     public function update(User $user, ItemTemplate $itemtemplate)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($itemtemplate->company_id) && $user->can('update-item-template', $itemtemplate);
     }
 
@@ -75,6 +77,7 @@ public function update(User $user, ItemTemplate $itemtemplate)
     public function delete(User $user, ItemTemplate $itemtemplate)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($itemtemplate->company_id) && $user->can('delete-item-template', $itemtemplate);
     }
 }
diff --git a/app/Policies/OldInvoiceItemPolicy.php b/app/Policies/OldInvoiceItemPolicy.php
@@ -35,6 +35,7 @@ public function index(User $user)
     public function view(User $user, OldInvoiceItem $oldInvoiceItem)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($oldInvoiceItem->invoice->company_id) && $user->can('view-invoice', Invoice::class);
     }
 
@@ -61,6 +62,7 @@ public function create(User $user)
     public function update(User $user, OldInvoiceItem $oldInvoiceItem)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($oldInvoiceItem->invoice->company_id) && $user->can('update-invoice', Invoice::class);
     }
 
@@ -75,6 +77,7 @@ public function update(User $user, OldInvoiceItem $oldInvoiceItem)
     public function delete(User $user, OldInvoiceItem $oldInvoiceItem)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($oldInvoiceItem->invoice->company_id) && $user->can('delete-invoice', Invoice::class);
     }
 }
diff --git a/app/Policies/OldInvoicePolicy.php b/app/Policies/OldInvoicePolicy.php
@@ -35,6 +35,7 @@ public function index(User $user)
     public function view(User $user, OldInvoice $oldInvoice)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($oldInvoice->company_id) && $user->can('view-invoice', Invoice::class);
     }
 
@@ -61,6 +62,7 @@ public function create(User $user)
     public function update(User $user, OldInvoice $oldInvoice)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($oldInvoice->company_id) && $user->can('update-invoice', Invoice::class);
     }
 
@@ -75,6 +77,7 @@ public function update(User $user, OldInvoice $oldInvoice)
     public function delete(User $user, OldInvoice $oldInvoice)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($oldInvoice->company_id) && $user->can('delete-invoice', Invoice::class);
     }
 }
diff --git a/app/Policies/PaymentPolicy.php b/app/Policies/PaymentPolicy.php
@@ -34,6 +34,7 @@ public function index(User $user)
     public function view(User $user, Payment $payment)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($payment->company_id) && $user->can('view-payment', $payment);
     }
 
@@ -60,6 +61,7 @@ public function create(User $user)
     public function update(User $user, Payment $payment)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($payment->company_id) && $user->can('update-payment', $payment);
     }
 
@@ -74,6 +76,7 @@ public function update(User $user, Payment $payment)
     public function delete(User $user, Payment $payment)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($payment->company_id) && $user->can('delete-payment', $payment);
     }
 }
diff --git a/app/Policies/QuoteItemPolicy.php b/app/Policies/QuoteItemPolicy.php
@@ -35,6 +35,7 @@ public function index(User $user)
     public function view(User $user, QuoteItem $quoteItem)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($quoteItem->quote->company_id) && $user->can('view-quote', Quote::class);
     }
 
@@ -61,6 +62,7 @@ public function create(User $user)
     public function update(User $user, QuoteItem $quoteItem)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($quoteItem->quote->company_id) && $user->can('update-quote', Quote::class);
     }
 
@@ -75,6 +77,7 @@ public function update(User $user, QuoteItem $quoteItem)
     public function delete(User $user, QuoteItem $quoteItem)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($quoteItem->quote->company_id) && $user->can('delete-quote', Quote::class);
     }
 }
diff --git a/app/Policies/QuotePolicy.php b/app/Policies/QuotePolicy.php
@@ -35,6 +35,7 @@ public function index(User $user)
     public function view(User $user, Quote $quote)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($quote->company_id) && $user->can('view-quote', $quote);
     }
 
@@ -61,6 +62,7 @@ public function create(User $user)
     public function update(User $user, Quote $quote)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($quote->company_id) && $user->can('update-quote', $quote);
     }
 
@@ -75,6 +77,7 @@ public function update(User $user, Quote $quote)
     public function delete(User $user, Quote $quote)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($quote->company_id) && $user->can('delete-quote', $quote);
     }
 }
diff --git a/app/Policies/ReceiptPolicy.php b/app/Policies/ReceiptPolicy.php
@@ -34,6 +34,7 @@ public function index(User $user)
     public function view(User $user, Receipt $receipt)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($receipt->company_id) && $user->can('view-receipt', $receipt);
     }
 
@@ -60,6 +61,7 @@ public function create(User $user)
     public function update(User $user, Receipt $receipt)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($receipt->company_id) && $user->can('update-receipt', $receipt);
     }
 
@@ -74,6 +76,7 @@ public function update(User $user, Receipt $receipt)
     public function delete(User $user, Receipt $receipt)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($receipt->company_id) && $user->can('delete-receipt', $receipt);
     }
 }
diff --git a/app/Policies/RolePolicy.php b/app/Policies/RolePolicy.php
@@ -34,6 +34,7 @@ public function index(User $user)
     public function view(User $user, Role $role)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($role->scope) && $user->can('view-role', $role);
     }
 
@@ -60,6 +61,7 @@ public function create(User $user)
     public function update(User $user, Role $role)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($role->scope) && $user->can('update-role', $role);
     }
 
@@ -74,6 +76,7 @@ public function update(User $user, Role $role)
     public function delete(User $user, Role $role)
     {
         $userCompanies = $user->companies()->pluck('companies.id');
+
         return $userCompanies->contains($role->scope) && $user->can('delete-role', $role);
     }
 }