Modernize PHP codebase with strict typing

.github/workflows/style.yml

@@ -1,6 +1,10 @@
 name: Fix Code Styling
 
-on: [ push ]
+on:
+  push:
+    branches:
+      - main
+      - '*.x'
 
 jobs:
   lint:
@@ -18,7 +22,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.4"
+          php-version: 8.4
           extensions: json, dom, curl, libxml, mbstring
           coverage: none
 

.github/workflows/tests.yml

@@ -17,16 +17,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ 8.1, 8.2, 8.3, 8.4 ]
+        php: [ 8.2, 8.3, 8.4 ]
         laravel: [ '10.*', '11.*', '12.*' ]
         dependency-version: [ prefer-lowest, prefer-stable ]
 
-        exclude:
-          - laravel: 11.*
-            php: 8.1
-          - laravel: 12.*
-            php: 8.1
-
     name: P${{ matrix.php }} / L${{ matrix.laravel }} / ${{ matrix.dependency-version }}
 
     steps:

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## Unreleased
+
+### Added
+- PHP 8.4 support in CI test matrix
+
+### Changed
+- Default config now uses Vite instead of Laravel Mix (`vite.config.js`, `build/manifest.json`, `build/assets`)
+- Modernized codebase with strict PHP typing (return types, parameter types, property types)
+- Updated minimum dev dependency versions for PHPUnit 10+ compatibility
+- CI workflow now uses local Pint instead of global installation
+
+### Removed
+- Support for PHPUnit 8 and 9
+- Support for Orchestra Testbench < 8.21 and < 9.2
+- Unused MySQL service from CI workflow
+- Legacy test script
+
 ## 0.2.3 - 2022-02-15
 - Added: Support for Laravel 9
 

config/airdrop.php

@@ -73,9 +73,9 @@
                 // this makes the most sense and doesn't need to be changed.
                 resource_path(),
 
-                // Any time the webpack.mix.js file is changed, it could affect the
+                // Any time the vite.config.js file is changed, it could affect
                 // the build steps, and therefore the built files.
-                base_path('webpack.mix.js'),
+                base_path('vite.config.js'),
 
                 // Depending on your package manager, you'll want to uncomment one
                 // of the following lines. Whenever JS packages are updated or
@@ -120,14 +120,11 @@
          * Files or folders that should be included.
          */
         'include' => [
-            // The mix-manifest file tells Laravel how to get your versioned assets.
-            public_path('mix-manifest.json'),
+            // The Vite manifest file tells Laravel how to get your versioned assets.
+            public_path('build/manifest.json'),
 
-            // Compiled CSS.
-            public_path('css'),
-
-            // Compiled JS.
-            public_path('js'),
+            // Compiled assets from Vite.
+            public_path('build/assets'),
         ],
 
         /*

src/AirdropServiceProvider.php

@@ -15,7 +15,7 @@
 
 class AirdropServiceProvider extends ServiceProvider
 {
-    public function boot()
+    public function boot(): void
     {
         if ($this->app->runningInConsole()) {
             $this->commands([
@@ -32,7 +32,7 @@ public function boot()
         ], 'config');
     }
 
-    public function register()
+    public function register(): void
     {
         $this->mergeConfigFrom(__DIR__ . '/../config/airdrop.php', 'airdrop');
     }

src/Commands/Debug.php

@@ -7,16 +7,16 @@
 namespace AaronFrancis\Airdrop\Commands;
 
 use AaronFrancis\Airdrop\HashGenerator;
-use Arr;
 use Illuminate\Console\Command;
+use Illuminate\Support\Arr;
 
 class Debug extends Command
 {
     protected $signature = 'airdrop:debug {--trigger=}';
 
     protected $description = 'Output the array of all triggers, or a specific trigger.';
 
-    public function handle()
+    public function handle(): void
     {
         $output = HashGenerator::make()->asArray();
 

src/Commands/Download.php

@@ -17,7 +17,7 @@ class Download extends Command
 
     protected $description = 'Run as a part of your deploy pipeline *before* assets are built.';
 
-    public function handle()
+    public function handle(): void
     {
         config([
             'airdrop.verbose' => $this->option('verbose')

src/Commands/Hash.php

@@ -15,7 +15,7 @@ class Hash extends Command
 
     protected $description = 'Output the calculated hash.';
 
-    public function handle()
+    public function handle(): void
     {
         $hash = HashGenerator::make()->generate();
 

src/Commands/Install.php

@@ -12,18 +12,8 @@
 
 class Install extends Command
 {
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
     protected $signature = 'airdrop:install';
 
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
     protected $description = 'Install the Airdrop config file into your app.';
 
     public function __construct()
@@ -35,10 +25,7 @@ public function __construct()
         }
     }
 
-    /**
-     * @throws Exception
-     */
-    public function handle()
+    public function handle(): void
     {
         Artisan::call('vendor:publish', [
             '--provider' => AirdropServiceProvider::class

src/Commands/Upload.php

@@ -13,7 +13,7 @@ class Upload extends Command
 
     protected $description = 'Run as a part of your deploy pipeline *after* assets are built.';
 
-    public function handle()
+    public function handle(): void
     {
         config([
             'airdrop.verbose' => $this->option('verbose')

src/Concerns/MakesDrivers.php

@@ -13,12 +13,7 @@
 
 trait MakesDrivers
 {
-    /**
-     * @return BaseDriver
-     *
-     * @throws Exception
-     */
-    public function makeDriver()
+    public function makeDriver(): BaseDriver
     {
         $config = $this->getDriverConfig();
 
@@ -30,21 +25,15 @@ public function makeDriver()
         return $class->setConfig($config)->setCurrentHash(HashGenerator::make()->generate());
     }
 
-    /**
-     * @return string|null
-     */
-    public function getDriverConfig()
+    public function getDriverConfig(): ?array
     {
         $driver = config('airdrop.driver') ?? 'DRIVER_NOT_SET';
         $drivers = config('airdrop.drivers');
 
         return Arr::get($drivers, $driver);
     }
 
-    /**
-     * @throws Exception
-     */
-    protected function ensureDriverExtendsBase($driver)
+    protected function ensureDriverExtendsBase(mixed $driver): void
     {
         if (!is_subclass_of($driver, BaseDriver::class)) {
             throw new Exception('Airdrop drivers must extend ' . json_encode(BaseDriver::class));

src/Contracts/TriggerContract.php

@@ -11,9 +11,6 @@ interface TriggerContract
     /**
      * Return any state that should be considered when determining
      * whether or not your build process needs to run again.
-     *
-     * @param  array  $config
-     * @return array
      */
-    public function triggerBuildWhenChanged($config = []);
+    public function triggerBuildWhenChanged(array $config = []): array;
 }

src/Drivers/BaseDriver.php

@@ -8,42 +8,32 @@
 
 abstract class BaseDriver
 {
-    /**
-     * Config for this specific driver.
-     *
-     * @var array
-     */
-    protected $config;
-
-    /**
-     * Current hash based on all inputs.
-     *
-     * @var string
-     */
-    protected $hash;
-
-    public function setConfig($config)
+    protected array $config = [];
+
+    protected string $hash = '';
+
+    public function setConfig(array $config): static
     {
         $this->config = $config;
 
         return $this;
     }
 
-    public function setCurrentHash($hash)
+    public function setCurrentHash(string $hash): static
     {
         $this->hash = $hash;
 
         return $this;
     }
 
-    public function output($line)
+    public function output(string $line): void
     {
         if (config('airdrop.verbose')) {
             echo "[Airdrop] $line\n";
         }
     }
 
-    abstract public function download();
+    abstract public function download(): void;
 
-    abstract public function upload();
+    abstract public function upload(): void;
 }