Merge pull request #594 from daveroverts/laravel-pint

fix(build): add laravel pint with psr12 preset
daveroverts · Nov 2, 2022 · e81eff6 · e81eff6
2 parents cbed588 + 8691e1c
commit e81eff6
Show file tree

Hide file tree

Showing 42 changed files with 83 additions and 67 deletions.
diff --git a/.github/workflows/pint.yml b/.github/workflows/pint.yml
@@ -0,0 +1,12 @@
+name: PHP Linting
+on: pull_request
+jobs:
+  phplint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: "laravel-pint"
+        uses: aglipanci/[email protected]
+        with:
+          verboseMode: true
+          testMode: true
diff --git a/app/Events/BookingCancelled.php b/app/Events/BookingCancelled.php
@@ -4,13 +4,10 @@
 
 use App\Models\User;
 use App\Models\Booking;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
 class BookingCancelled
 {

diff --git a/app/Events/BookingChanged.php b/app/Events/BookingChanged.php
@@ -3,11 +3,8 @@
 namespace App\Events;
 
 use App\Models\Booking;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;

diff --git a/app/Events/BookingConfirmed.php b/app/Events/BookingConfirmed.php
@@ -3,11 +3,8 @@
 namespace App\Events;
 
 use App\Models\Booking;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 

diff --git a/app/Events/BookingDeleted.php b/app/Events/BookingDeleted.php
@@ -4,13 +4,10 @@
 
 use App\Models\User;
 use App\Models\Event;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 
 class BookingDeleted
 {

diff --git a/app/Events/EventBulkEmail.php b/app/Events/EventBulkEmail.php
@@ -3,11 +3,8 @@
 namespace App\Events;
 
 use App\Models\Event;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Collection;

diff --git a/app/Events/EventFinalInformation.php b/app/Events/EventFinalInformation.php
@@ -4,11 +4,8 @@
 
 use App\Models\Booking;
 use App\Models\User;
-use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PresenceChannel;
 use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
 use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
 

diff --git a/app/Exports/BookingsExport.php b/app/Exports/BookingsExport.php
@@ -3,7 +3,6 @@
 namespace App\Exports;
 
 use App\Models\Event;
-use App\Models\Booking;
 use App\Enums\BookingStatus;
 use App\Enums\EventType;
 use Maatwebsite\Excel\Concerns\Exportable;

diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
@@ -2,8 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-
 class AdminController extends Controller
 {
     //

diff --git a/app/Http/Controllers/Airport/AirportAdminController.php b/app/Http/Controllers/Airport/AirportAdminController.php
@@ -9,7 +9,6 @@
 use App\Http\Controllers\AdminController;
 use App\Http\Requests\Airport\Admin\StoreAirport;
 use App\Http\Requests\Airport\Admin\UpdateAirport;
-use App\Jobs\ImportAirportsJob;
 
 class AirportAdminController extends AdminController
 {

diff --git a/app/Http/Controllers/Event/EventAdminController.php b/app/Http/Controllers/Event/EventAdminController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Event;
 
-use Carbon\Carbon;
 use App\Models\User;
 use App\Models\Event;
 use App\Models\Airport;

diff --git a/app/Http/Controllers/OAuthController.php b/app/Http/Controllers/OAuthController.php
@@ -2,9 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
-use League\OAuth2\Client\Token;
-use Illuminate\Support\Facades\Auth;
 use League\OAuth2\Client\Provider\GenericProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use League\OAuth2\Client\Token\AccessToken;

diff --git a/app/Http/Livewire/Bookings.php b/app/Http/Livewire/Bookings.php
@@ -3,9 +3,7 @@
 namespace App\Http\Livewire;
 
 use App\Models\Event;
-use App\Models\Booking;
 use Livewire\Component;
-use App\Enums\EventType;
 use App\Enums\BookingStatus;
 
 class Bookings extends Component

diff --git a/app/Http/Middleware/IsAdmin.php b/app/Http/Middleware/IsAdmin.php
@@ -3,7 +3,6 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Illuminate\Support\Facades\Auth;
 
 class IsAdmin
 {

diff --git a/app/Http/Middleware/IsLoggedIn.php b/app/Http/Middleware/IsLoggedIn.php
@@ -3,7 +3,6 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Illuminate\Support\Facades\Auth;
 
 class IsLoggedIn
 {

diff --git a/app/Http/Requests/Booking/UpdateBooking.php b/app/Http/Requests/Booking/UpdateBooking.php
@@ -3,7 +3,6 @@
 namespace App\Http\Requests\Booking;
 
 use App\Http\Requests\Request;
-use Illuminate\Support\Facades\Auth;
 
 class UpdateBooking extends Request
 {

diff --git a/app/Jobs/EventCleanupReservationsJob.php b/app/Jobs/EventCleanupReservationsJob.php
@@ -10,7 +10,6 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
 
 class EventCleanupReservationsJob implements ShouldQueue
 {

diff --git a/app/Jobs/ImportAirportsJob.php b/app/Jobs/ImportAirportsJob.php
@@ -4,7 +4,6 @@
 
 use Illuminate\Bus\Queueable;
 use App\Imports\AirportsImport;
-use Illuminate\Support\Facades\Bus;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Queue\InteractsWithQueue;

diff --git a/app/Listeners/SendBookingCancelledNotification.php b/app/Listeners/SendBookingCancelledNotification.php
@@ -4,7 +4,6 @@
 
 use App\Events\BookingCancelled;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 
 class SendBookingCancelledNotification implements ShouldQueue
 {

diff --git a/app/Listeners/SendBookingChangedNotification.php b/app/Listeners/SendBookingChangedNotification.php
@@ -4,7 +4,6 @@
 
 use App\Events\BookingChanged;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 
 class SendBookingChangedNotification implements ShouldQueue
 {

diff --git a/app/Listeners/SendBookingConfirmedNotification.php b/app/Listeners/SendBookingConfirmedNotification.php
@@ -4,7 +4,6 @@
 
 use App\Events\BookingConfirmed;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 
 class SendBookingConfirmedNotification implements ShouldQueue
 {

diff --git a/app/Listeners/SendBookingDeletedNotification.php b/app/Listeners/SendBookingDeletedNotification.php
@@ -4,7 +4,6 @@
 
 use App\Events\BookingDeleted;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 
 class SendBookingDeletedNotification implements ShouldQueue
 {

diff --git a/app/Listeners/SendEventBulkEmailNotification.php b/app/Listeners/SendEventBulkEmailNotification.php
@@ -4,7 +4,6 @@
 
 use App\Events\EventBulkEmail;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Support\Facades\Notification;
 
 class SendEventBulkEmailNotification implements ShouldQueue

diff --git a/app/Listeners/SendEventFinalInformationNotification.php b/app/Listeners/SendEventFinalInformationNotification.php
@@ -4,7 +4,6 @@
 
 use App\Events\EventFinalInformation;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Queue\InteractsWithQueue;
 
 class SendEventFinalInformationNotification implements ShouldQueue
 {

diff --git a/app/Models/AirportLink.php b/app/Models/AirportLink.php
@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\Airport;
-use App\Models\AirportLinkType;
 use Spatie\Activitylog\LogOptions;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Activitylog\Traits\LogsActivity;

diff --git a/app/Models/AirportLinkType.php b/app/Models/AirportLinkType.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\AirportLink;
 use Spatie\Activitylog\LogOptions;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;

diff --git a/app/Models/Booking.php b/app/Models/Booking.php
@@ -2,10 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\User;
-use App\Models\Event;
-use App\Models\Flight;
-use App\Models\Airport;
 use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
 use Spatie\Activitylog\LogOptions;

diff --git a/app/Models/Event.php b/app/Models/Event.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\EventLink;
 use Spatie\Activitylog\LogOptions;
 use Illuminate\Database\Eloquent\Model;
 use Cviebrock\EloquentSluggable\Sluggable;

diff --git a/app/Models/EventLink.php b/app/Models/EventLink.php
@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\Event;
-use App\Models\AirportLinkType;
 use Spatie\Activitylog\LogOptions;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Activitylog\Traits\LogsActivity;

diff --git a/app/Models/EventType.php b/app/Models/EventType.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\Event;
 use Spatie\Activitylog\LogOptions;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Builder;

diff --git a/app/Models/Faq.php b/app/Models/Faq.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\Event;
 use Spatie\Activitylog\LogOptions;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Activitylog\Traits\LogsActivity;

diff --git a/app/Models/Flight.php b/app/Models/Flight.php
@@ -2,8 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\Airport;
-use App\Models\Booking;
 use Spatie\Activitylog\LogOptions;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\Activitylog\Traits\LogsActivity;

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -2,7 +2,6 @@
 
 namespace App\Models;
 
-use App\Models\Booking;
 use Spatie\Activitylog\LogOptions;
 use Illuminate\Notifications\Notifiable;
 use App\Http\Controllers\OAuthController;

diff --git a/composer.json b/composer.json
@@ -36,6 +36,7 @@
         "beyondcode/laravel-query-detector": "^1.6",
         "brianium/paratest": "^6.4",
         "fakerphp/faker": "^1.18",
+        "laravel/pint": "^1.2",
         "laravel/sail": "^1.13",
         "mockery/mockery": "^1.5",
         "nunomaduro/collision": "^6.1",

diff --git a/composer.lock b/composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,6 @@ @@
     namespace App\Http\Controllers;
-    use Illuminate\Http\Request;
     class AdminController extends Controller
     {
         //
@@ Expand Down @@