Merge pull request #7 from kduma-OSS/develop

Cleanup commands and use PHP 8.1 features

Author: kduma

app/Api/JobModel.php

@@ -5,13 +5,13 @@
 class JobModel
 {
     public function __construct(
-        public string $id,
-        public string $name,
-        public string $printer,
-        public array $options,
-        public string $type,
-        public string $file_name,
-        public mixed $content,
+        public readonly string $id,
+        public readonly string $name,
+        public readonly string $printer,
+        public readonly array $options,
+        public readonly string $type,
+        public readonly string $file_name,
+        public readonly mixed $content,
     ) {
     }
 }

app/Commands/.gitkeep

@@ -2,8 +2,8 @@
 
 namespace App\Commands;
 
+use Brick\VarExporter\ExportException;
 use Brick\VarExporter\VarExporter;
-use Illuminate\Console\Scheduling\Schedule;
 use LaravelZero\Framework\Commands\Command;
 
 class ParsePpdOptionsFromPpdFileCommand extends Command
@@ -25,9 +25,11 @@ class ParsePpdOptionsFromPpdFileCommand extends Command
     /**
      * Execute the console command.
      *
-     * @return mixed
+     * @return int
+     *
+     * @throws ExportException
      */
-    public function handle()
+    public function handle(): int
     {
         $contents = array_map('trim', file($this->argument('file')));
         $options_array = [];
@@ -100,16 +102,7 @@ public function handle()
         } else {
             echo json_encode($options_array, JSON_PRETTY_PRINT);
         }
-    }
 
-    /**
-     * Define the command's schedule.
-     *
-     * @param  Schedule  $schedule
-     * @return void
-     */
-    public function schedule(Schedule $schedule): void
-    {
-        // $schedule->command(static::class)->everyMinute();
+        return self::SUCCESS;
     }
 }

app/Commands/ParsePpdOptionsFromPpdFileCommand.php

@@ -14,7 +14,6 @@
 use App\Printers\Protocols\LpdProtocol;
 use App\Printers\Protocols\PrinterProtocolInterface;
 use App\Printers\Protocols\RawProtocol;
-use Illuminate\Console\Scheduling\Schedule;
 use LaravelZero\Framework\Commands\Command;
 
 class RunServiceCommand extends Command
@@ -38,9 +37,9 @@ class RunServiceCommand extends Command
      *
      * @param  WebPrintHostInterface  $api
      * @param  PollTimeCalculatorInterface  $ptc
-     * @return mixed
+     * @return never
      */
-    public function handle(WebPrintHostInterface $api, PollTimeCalculatorInterface $ptc)
+    public function handle(WebPrintHostInterface $api, PollTimeCalculatorInterface $ptc): never
     {
         while (true) {
             $this->line('Checking for new jobs...');
@@ -96,15 +95,4 @@ private function processJob(WebPrintHostInterface $api, string $id)
             $api->markJobAsFailed($id, 'TypeNotSupportedException');
         }
     }
-
-    /**
-     * Define the command's schedule.
-     *
-     * @param  Schedule  $schedule
-     * @return void
-     */
-    public function schedule(Schedule $schedule): void
-    {
-        // $schedule->command(static::class)->everyMinute();
-    }
 }

app/Commands/RunServiceCommand.php

@@ -9,7 +9,7 @@ class ConstantPollTime implements PollTimeCalculatorInterface
      *
      * @param  int  $delay Delay in miliseconds between each check of new print jobs
      */
-    public function __construct(protected int $delay)
+    public function __construct(protected readonly int $delay)
     {
     }
 

app/PollingCalculators/ConstantPollTime.php

@@ -16,11 +16,11 @@ class DynamicPollTime implements PollTimeCalculatorInterface
      * @param  float  $warmup_factor   WarmUp factor
      */
     public function __construct(
-        protected int $minimum = 1000,
-        protected int $maximum = 60000,
-        protected float $increase_factor = 1.02,
-        protected float $decrease_factor = 0,
-        protected float $warmup_factor = 0,
+        protected readonly int $minimum = 1000,
+        protected readonly int $maximum = 60000,
+        protected readonly float $increase_factor = 1.02,
+        protected readonly float $decrease_factor = 0,
+        protected readonly float $warmup_factor = 0,
     ) {
         $this->current_delay = $this->minimum;
     }

app/PollingCalculators/DynamicPollTime.php

@@ -15,7 +15,7 @@ class AppServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         //
     }
@@ -25,7 +25,7 @@ public function boot()
      *
      * @return void
      */
-    public function register()
+    public function register(): void
     {
         $this->app->singleton(WebPrintHostInterface::class, function ($app) {
             return new HttpWebPrintHost();