Laravel 11 (#84)

* Convert string references to `::class`

PHP 5.5.9 adds the new static `class` property which provides the fully qualified class name. This is preferred over using strings for class names since the `class` property references are checked by PHP.

* Use Faker methods

Accessing Faker properties was deprecated in Faker 1.14.

* Convert route options to fluent methods

Laravel 8 adopts the tuple syntax for controller actions. Since the old options array is incompatible with this syntax, Shift converted them to use modern, fluent methods.

* Adopt class based routes

* Remove default `app` files

* Shift core files

* Streamline config files

* Set new `ENV` variables

* Default new `bootstrap/app.php`

* Re-register HTTP middleware

* Consolidate service providers

* Re-register service providers

* Re-register routes

* Re-register scheduled commands

* Bump Composer dependencies

* Use `<env>` tags for configuration

`<env>` tags have a lower precedence than system environment variables making it easier to overwrite PHPUnit configuration values in additional environments, such a CI.

Review this blog post for more details on configuration precedence when testing Laravel: https://jasonmccreary.me/articles/laravel-testing-configuration-precedence/

* Adopt anonymous migrations

* Rename `password_resets` table

* Convert `$casts` property to method

* Adopt Laravel type hints

* Mark base controller as `abstract`

* Remove `CreatesApplication` testing trait

* Shift cleanup

* Fix shift first issues

* Updating Rules for laravel 11, sanctum config and pint

* Fix Carbon issue on dashboard

* Temporary fix for tests while migration is issue fixed on laravel side

* Carbon needs numerical values, not strings

* Minimum php version

* Fix domain installation step not fetching the correct company_id

* Fix Role Policy wasn't properly registered

---------

app/Http/Resources/AbilityCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class AbilityCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/AbilityResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class AbilityResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/AddressCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class AddressCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/AddressResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class AddressResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/CompanyCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CompanyCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/CompanyResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CompanyResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/CountryCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CountryCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/CountryResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CountryResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/CurrencyCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CurrencyCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/CurrencyResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CurrencyResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/CustomFieldCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CustomFieldCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/CustomFieldResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CustomFieldResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/CustomFieldValueCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CustomFieldValueCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/CustomFieldValueResource.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
+use App\Models\CompanySetting;
 use Illuminate\Http\Resources\Json\JsonResource;
-use InvoiceShelf\Models\CompanySetting;
 
 class CustomFieldValueResource extends JsonResource
 {
@@ -11,9 +11,8 @@ class CustomFieldValueResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/AddressCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class AddressCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/AddressResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class AddressResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/CompanyResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CompanyResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/CountryCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CountryCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/CountryResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CountryResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/CurrencyCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CurrencyCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/CurrencyResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CurrencyResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/CustomFieldCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CustomFieldCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/CustomFieldResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CustomFieldResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/CustomFieldValueCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CustomFieldValueCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/CustomFieldValueResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CustomFieldValueResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/CustomerCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CustomerCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/CustomerResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CustomerResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/EstimateCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class EstimateCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/EstimateItemCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class EstimateItemCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/EstimateItemResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class EstimateItemResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/EstimateResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class EstimateResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/ExpenseCategoryCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class ExpenseCategoryCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/ExpenseCategoryResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class ExpenseCategoryResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/ExpenseCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class ExpenseCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/ExpenseResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class ExpenseResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/InvoiceCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class InvoiceCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/InvoiceItemCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class InvoiceItemCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/InvoiceItemResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class InvoiceItemResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/InvoiceResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class InvoiceResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/ItemCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class ItemCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/PaymentCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class PaymentCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/PaymentMethodCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class PaymentMethodCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/PaymentMethodResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class PaymentMethodResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/PaymentResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class PaymentResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/RecurringInvoiceCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class RecurringInvoiceCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/RecurringInvoiceResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class RecurringInvoiceResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/TaxCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class TaxCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/TaxResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class TaxResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/TaxTypeCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class TaxTypeCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/TaxTypeResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class TaxTypeResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/TransactionCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -12,7 +12,7 @@ class TransactionCollection extends ResourceCollection
      * @param  \Illuminate\Http\Request  $request
      * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/TransactionResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -12,7 +12,7 @@ class TransactionResource extends JsonResource
      * @param  \Illuminate\Http\Request  $request
      * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/Customer/UserCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class UserCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/Customer/UserResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources\Customer;
+namespace App\Http\Resources\Customer;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class UserResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/CustomerCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class CustomerCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/CustomerResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class CustomerResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/EstimateCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class EstimateCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/EstimateItemCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class EstimateItemCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/EstimateItemResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class EstimateItemResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/EstimateResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class EstimateResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/ExchangeRateLogCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class ExchangeRateLogCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/ExchangeRateLogResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class ExchangeRateLogResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/ExchangeRateProviderCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class ExchangeRateProviderCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/ExchangeRateProviderResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class ExchangeRateProviderResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/ExpenseCategoryCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class ExpenseCategoryCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/ExpenseCategoryResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class ExpenseCategoryResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/ExpenseCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class ExpenseCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/ExpenseResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class ExpenseResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/FileDiskCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class FileDiskCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/FileDiskResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class FileDiskResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/InvoiceCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class InvoiceCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/InvoiceItemCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class InvoiceItemCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/InvoiceItemResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class InvoiceItemResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/InvoiceResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class InvoiceResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/ItemCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class ItemCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/ItemResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class ItemResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/ModuleCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -12,7 +12,7 @@ class ModuleCollection extends ResourceCollection
      * @param  \Illuminate\Http\Request  $request
      * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/ModuleResource.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
+use App\Models\Module as ModelsModule;
+use App\Models\Setting;
 use Illuminate\Http\Resources\Json\JsonResource;
-use InvoiceShelf\Models\Module as ModelsModule;
-use InvoiceShelf\Models\Setting;
 use Nwidart\Modules\Facades\Module;
 
 class ModuleResource extends JsonResource
@@ -15,7 +15,7 @@ class ModuleResource extends JsonResource
      * @param  \Illuminate\Http\Request  $request
      * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         $this->checkPurchased();
         $this->installed_module = ModelsModule::where('name', $this->module_name)->first();

app/Http/Resources/NoteCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class NoteCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/NoteResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class NoteResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/PaymentCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class PaymentCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/PaymentMethodCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class PaymentMethodCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/PaymentMethodResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class PaymentMethodResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/PaymentResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class PaymentResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/RecurringInvoiceCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class RecurringInvoiceCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/RecurringInvoiceResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class RecurringInvoiceResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/RoleCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class RoleCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/RoleResource.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
+use App\Models\CompanySetting;
 use Carbon\Carbon;
 use Illuminate\Http\Resources\Json\JsonResource;
-use InvoiceShelf\Models\CompanySetting;
 
 class RoleResource extends JsonResource
 {
@@ -12,9 +12,8 @@ class RoleResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/TaxCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class TaxCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/TaxResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class TaxResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/TaxTypeCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class TaxTypeCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/TaxTypeResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class TaxTypeResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/TransactionCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -12,7 +12,7 @@ class TransactionCollection extends ResourceCollection
      * @param  \Illuminate\Http\Request  $request
      * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/TransactionResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -12,7 +12,7 @@ class TransactionResource extends JsonResource
      * @param  \Illuminate\Http\Request  $request
      * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/UnitCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class UnitCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/UnitResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class UnitResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,

app/Http/Resources/UserCollection.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\ResourceCollection;
 
@@ -10,9 +10,8 @@ class UserCollection extends ResourceCollection
      * Transform the resource collection into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return parent::toArray($request);
     }

app/Http/Resources/UserResource.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace InvoiceShelf\Http\Resources;
+namespace App\Http\Resources;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -10,9 +10,8 @@ class UserResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @return array
      */
-    public function toArray($request)
+    public function toArray($request): array
     {
         return [
             'id' => $this->id,