Merge pull request #508 from tighten/ajm/update-duster

Apply formatting fixes with Duster
tighten · Jul 3, 2024 · d8d6633 · d8d6633
2 parents 8a08058 + c6eb589
commit d8d6633
Show file tree

Hide file tree

Showing 119 changed files with 349 additions and 670 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -6,46 +6,15 @@ on:
     pull_request:
 
 jobs:
-    phpcs:
-        name: PHPCS
-
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v2
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: 8.3
-                  extensions: posix, dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
-                  coverage: none
-
-            - name: Install dependencies
-              run: composer install --no-interaction --no-suggest --ignore-platform-reqs
-
-            - name: PHPCS lint
-              run: vendor/bin/phpcs --warning-severity=0
-
-    tlint:
-        name: TLint
-
-        continue-on-error: false
-
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v1
-
-            - name: Setup PHP
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: 8.3
-                  extensions: posix, dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick
-                  coverage: none
-
-            - name: Install dependencies
-              run: composer install --no-interaction --no-suggest --ignore-platform-reqs
-
-            - name: Tlint Lint
-              run: vendor/bin/tlint
+  duster:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
+      - name: "Duster Lint"
+        uses: tighten/duster-action@v3
+        with:
+          args: lint
diff --git a/app/CallingAllPapers/Client.php b/app/CallingAllPapers/Client.php
@@ -2,9 +2,7 @@
 
 namespace App\CallingAllPapers;
 
-use App\CallingAllPapers\Event;
 use GuzzleHttp\Client as GuzzleClient;
-use GuzzleHttp\json_decode;
 
 class Client
 {

diff --git a/app/CallingAllPapers/ConferenceImporter.php b/app/CallingAllPapers/ConferenceImporter.php
@@ -16,7 +16,7 @@ class ConferenceImporter
 
     private $geocoder;
 
-    public function __construct(int $authorId = null)
+    public function __construct(?int $authorId = null)
     {
         $this->authorId = $authorId ?: auth()->user()->id;
         $this->geocoder = app(Geocoder::class);

diff --git a/app/CallingAllPapers/Event.php b/app/CallingAllPapers/Event.php
@@ -43,13 +43,11 @@ class Event
     /** The URI to the event's CFP */
     public $uri;
 
-    private function __construct()
-    {
-    }
+    private function __construct() {}
 
     public static function createFromApiObject(stdClass $object)
     {
-        $event = new self();
+        $event = new self;
         $event->id = self::generateIdWithYear($object);
 
         foreach (get_object_vars($event) as $property => $unused) {

diff --git a/app/Casts/SpeakerPackage.php b/app/Casts/SpeakerPackage.php
@@ -55,7 +55,7 @@ public function toDisplay()
     {
         if (! $this->currency) {
             return collect();
-        };
+        }
 
         return collect($this->categories)->map(function ($item) {
             $currency = $this->currency;
@@ -68,7 +68,7 @@ public function toDecimal($category)
     {
         if (! $this->currency || ! array_key_exists($category, $this->categories)) {
             return;
-        };
+        }
 
         return with($this->categories[$category], function ($amount) {
             if (! $amount > 0) {
@@ -85,7 +85,7 @@ public function toArray()
     {
         if (! $this->currency) {
             return [];
-        };
+        }
 
         return array_merge(['currency' => $this->currency], $this->categories);
     }

diff --git a/app/Commands/Command.php b/app/Commands/Command.php
@@ -2,6 +2,4 @@
 
 namespace App\Commands;
 
-abstract class Command
-{
-}
+abstract class Command {}
diff --git a/app/Console/Commands/VerifyConferenceImporterHeartbeat.php b/app/Console/Commands/VerifyConferenceImporterHeartbeat.php
@@ -16,7 +16,7 @@ class VerifyConferenceImporterHeartbeat extends Command
     public function handle(): int
     {
         if ($this->importerAppearsInactive()) {
-            (new TightenSlack())->notify(new ConferenceImporterInactive());
+            (new TightenSlack)->notify(new ConferenceImporterInactive);
         }
 
         return Command::SUCCESS;

diff --git a/app/Events/Event.php b/app/Events/Event.php
@@ -2,6 +2,4 @@
 
 namespace App\Events;
 
-abstract class Event
-{
-}
+abstract class Event {}
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -6,7 +6,6 @@
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Throwable;
 
 class Handler extends ExceptionHandler
 {

diff --git a/app/Exceptions/InvalidAddressGeocodingException.php b/app/Exceptions/InvalidAddressGeocodingException.php
@@ -4,6 +4,4 @@
 
 use Exception;
 
-class InvalidAddressGeocodingException extends Exception
-{
-}
+class InvalidAddressGeocodingException extends Exception {}
diff --git a/app/Filament/Resources/ConferenceIssueResource.php b/app/Filament/Resources/ConferenceIssueResource.php
@@ -37,15 +37,15 @@ public static function form(Form $form): Form
                 Section::make('Conference')->columns(2)->schema([
                     Grid::make()->schema([
                         TextInput::make('name')
-                            ->formatStateUsing(fn($record) => $record->conference->title),
+                            ->formatStateUsing(fn ($record) => $record->conference->title),
                         TextInput::make('Event dates')
                             ->formatStateUsing(function ($record) {
                                 return $record->conference->startsAtDisplay() . ' - ' . $record->conference->endsAtDisplay();
                             }),
                         Grid::make(3)->columnSpan(1)->schema([
                             TextInput::make('url')
                                 ->columnSpan(2)
-                                ->formatStateUsing(fn($record) => $record->conference->url),
+                                ->formatStateUsing(fn ($record) => $record->conference->url),
                             DropInAction::make('Conference URL')
                                 ->columnSpan(1)
                                 ->disableLabel()
@@ -68,10 +68,10 @@ public static function form(Form $form): Form
                         TextInput::make('reason'),
                         TextInput::make('reported by')
                             ->columnSpan(1)
-                            ->formatStateUsing(fn($record) => $record->user->name),
+                            ->formatStateUsing(fn ($record) => $record->user->name),
                     ]),
                     Placeholder::make('note')
-                        ->content(fn($record) => $record->note),
+                        ->content(fn ($record) => $record->note),
                 ]),
             ]);
     }

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
@@ -79,39 +79,6 @@ public function update(Request $request): RedirectResponse
         return redirect('account');
     }
 
-    private function updateProfilePicture($user, $picture)
-    {
-        // Make regular image
-        $thumb = Image::make($picture->getRealPath())
-            ->fit(self::THUMB_SIZE, self::THUMB_SIZE);
-
-        // Make hires image
-        $hires = Image::make($picture->getRealPath())
-            ->fit(self::HIRES_SIZE, self::HIRES_SIZE, function ($constraint) {
-                $constraint->upsize();
-            });
-
-        // Delete the previous profile pictures
-        if ($user->profile_picture != null) {
-            Storage::delete([
-                User::PROFILE_PICTURE_THUMB_PATH . $user->profile_picture,
-                User::PROFILE_PICTURE_HIRES_PATH . $user->profile_picture,
-            ]);
-        }
-
-        // Store the new profile pictures
-        Storage::put(User::PROFILE_PICTURE_THUMB_PATH . $picture->hashName(), $thumb->stream());
-        Storage::put(User::PROFILE_PICTURE_HIRES_PATH . $picture->hashName(), $hires->stream());
-
-        // Save the updated filename to the user
-        $user->updateProfilePicture($picture->hashName());
-    }
-
-    public function delete(): View
-    {
-        return view('account.confirm-delete');
-    }
-
     public function destroy(): RedirectResponse
     {
         $user = auth()->user();
@@ -124,6 +91,11 @@ public function destroy(): RedirectResponse
         return redirect('/');
     }
 
+    public function delete(): View
+    {
+        return view('account.confirm-delete');
+    }
+
     public function export(Filesystem $storage): Response
     {
         $user = auth()->user();
@@ -151,4 +123,32 @@ public function oAuthSettings(): View
     {
         return view('account.oauth-settings');
     }
+
+    private function updateProfilePicture($user, $picture)
+    {
+        // Make regular image
+        $thumb = Image::make($picture->getRealPath())
+            ->fit(self::THUMB_SIZE, self::THUMB_SIZE);
+
+        // Make hires image
+        $hires = Image::make($picture->getRealPath())
+            ->fit(self::HIRES_SIZE, self::HIRES_SIZE, function ($constraint) {
+                $constraint->upsize();
+            });
+
+        // Delete the previous profile pictures
+        if ($user->profile_picture != null) {
+            Storage::delete([
+                User::PROFILE_PICTURE_THUMB_PATH . $user->profile_picture,
+                User::PROFILE_PICTURE_HIRES_PATH . $user->profile_picture,
+            ]);
+        }
+
+        // Store the new profile pictures
+        Storage::put(User::PROFILE_PICTURE_THUMB_PATH . $picture->hashName(), $thumb->stream());
+        Storage::put(User::PROFILE_PICTURE_HIRES_PATH . $picture->hashName(), $hires->stream());
+
+        // Save the updated filename to the user
+        $user->updateProfilePicture($picture->hashName());
+    }
 }
diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -18,14 +18,4 @@ class ForgotPasswordController extends Controller
     |
     */
     use SendsPasswordResetEmails;
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
 }
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
@@ -29,16 +29,6 @@ class LoginController extends Controller
      */
     protected $redirectTo = '/dashboard';
 
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest', ['except' => 'logout']);
-    }
-
     /**
      * Handle a login request to the application.
      *

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
@@ -5,7 +5,6 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Auth\RegisterFormRequest;
 use App\Models\User;
-use Illuminate\Auth\Events\Registered;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Event;
@@ -37,13 +36,13 @@ class RegisterController extends Controller
     protected $redirectTo = '/dashboard';
 
     /**
-     * Create a new controller instance.
+     * Handle a registration request for the application.
      *
-     * @return void
+     * @return \Illuminate\Http\Response
      */
-    public function __construct()
+    public function register(RegisterFormRequest $request)
     {
-        $this->middleware('guest');
+        return $this->registerUser($request);
     }
 
     /**
@@ -58,16 +57,6 @@ protected function validator(array $data): \Illuminate\Contracts\Validation\Vali
         ]);
     }
 
-    /**
-     * Handle a registration request for the application.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function register(RegisterFormRequest $request)
-    {
-        return $this->registerUser($request);
-    }
-
     /**
      * Create a new user instance after a valid registration.
      */

diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -20,14 +20,4 @@ class ResetPasswordController extends Controller
     use ResetsPasswords;
 
     public $redirectTo = '/dashboard';
-
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('guest');
-    }
 }
diff --git a/app/Http/Controllers/Auth/SocialLoginController.php b/app/Http/Controllers/Auth/SocialLoginController.php
@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers\Auth;
 
-use Illuminate\Http\RedirectResponse;
 use App\Http\Controllers\Controller;
 use App\Models\User;
-use Auth;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Socialite;
 
 class SocialLoginController extends Controller

diff --git a/app/Http/Controllers/BiosController.php b/app/Http/Controllers/BiosController.php
@@ -24,7 +24,7 @@ public function index(): View
     public function create(): View
     {
         return view('bios.create', [
-            'bio' => new Bio(),
+            'bio' => new Bio,
         ]);
     }
 

diff --git a/app/Http/Controllers/ConferencesController.php b/app/Http/Controllers/ConferencesController.php
@@ -17,7 +17,7 @@ class ConferencesController extends Controller
     public function create(): View
     {
         return view('conferences.create', [
-            'conference' => new Conference(),
+            'conference' => new Conference,
             'currencies' => Currency::all(),
         ]);
     }