Updating Scaffolder code with PHP 8.1 features

src/Scaffolder/composer.json

@@ -36,7 +36,7 @@
         "spiral/http": "^2.12",
         "spiral/migrations": "^2.3",
         "spiral/prototype": "^2.12",
-        "spiral/jobs": "^2.2"
+        "spiral/queue": "^2.12"
     },
     "autoload": {
         "files": [

src/Scaffolder/src/Bootloader/ScaffolderBootloader.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework. Scaffolder
- *
- * @license MIT
- * @author  Valentin V (vvval)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Scaffolder\Bootloader;
@@ -30,19 +23,10 @@ class ScaffolderBootloader extends Bootloader
         SlugifyInterface::class => Slugify::class,
     ];
 
-    /** @var ConfiguratorInterface */
-    private $config;
-
-    /** @var KernelInterface */
-    private $kernel;
-
-    /**
-     * ScaffolderBootloader constructor.
-     */
-    public function __construct(ConfiguratorInterface $config, KernelInterface $kernel)
-    {
-        $this->config = $config;
-        $this->kernel = $kernel;
+    public function __construct(
+        private readonly ConfiguratorInterface $config,
+        private readonly KernelInterface $kernel
+    ) {
     }
 
     public function boot(ConsoleBootloader $console): void
@@ -57,7 +41,7 @@ public function boot(ConsoleBootloader $console): void
 
         try {
             $defaultNamespace = (new ReflectionClass($this->kernel))->getNamespaceName();
-        } catch (ReflectionException $e) {
+        } catch (ReflectionException) {
             $defaultNamespace = '';
         }
 

src/Scaffolder/src/Command/AbstractCommand.php

@@ -1,13 +1,5 @@
 <?php
 
-/**
- * Spiral Framework. Scaffolder
- *
- * @license MIT
- * @author  Anton Titov (Wolfy-J)
- * @author  Valentin V (vvval)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Scaffolder\Command;
@@ -27,28 +19,12 @@ abstract class AbstractCommand extends Command
      */
     protected const ELEMENT = '';
 
-    /**
-     * @var ScaffolderConfig
-     */
-    protected $config;
-
-    /**
-     * @var FilesInterface
-     */
-    protected $files;
-
-    /** @var FactoryInterface */
-    private $factory;
-
     public function __construct(
-        ScaffolderConfig $config,
-        FilesInterface $files,
+        protected ScaffolderConfig $config,
+        protected FilesInterface $files,
         ContainerInterface $container,
-        FactoryInterface $factory
+        private readonly FactoryInterface $factory
     ) {
-        $this->config = $config;
-        $this->files = $files;
-        $this->factory = $factory;
         $this->setContainer($container);
 
         parent::__construct();
@@ -84,19 +60,19 @@ protected function getClass(): string
     /**
      * Write declaration into file.
      *
-     * @param string           $type If null static::ELEMENT to be used.
+     * @param string $type If null static::ELEMENT to be used.
      */
     protected function writeDeclaration(ClassDeclaration $declaration, string $type = null): void
     {
-        $type = $type ?? static::ELEMENT;
+        $type ??= static::ELEMENT;
 
         $filename = $this->config->classFilename($type, (string)$this->argument('name'));
         $filename = $this->files->normalizePath($filename);
 
         if ($this->files->exists($filename)) {
             $this->writeln(
-                "<fg=red>Unable to create '<comment>{$declaration->getName()}</comment>' declaration, "
-                . "file '<comment>{$filename}</comment>' already exists.</fg=red>"
+                \sprintf("<fg=red>Unable to create '<comment>%s</comment>' declaration, ", $declaration->getName())
+                . \sprintf("file '<comment>%s</comment>' already exists.</fg=red>", $filename)
             );
 
             return;
@@ -119,8 +95,8 @@ protected function writeDeclaration(ClassDeclaration $declaration, string $type
         );
 
         $this->writeln(
-            "Declaration of '<info>{$declaration->getName()}</info>' "
-            . "has been successfully written into '<comment>{$filename}</comment>'."
+            \sprintf("Declaration of '<info>%s</info>' ", $declaration->getName())
+            . \sprintf("has been successfully written into '<comment>%s</comment>'.", $filename)
         );
     }
 

src/Scaffolder/src/Command/BootloaderCommand.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework. Scaffolder
- *
- * @license MIT
- * @author  Valentin V (vvval)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Scaffolder\Command;
@@ -36,11 +29,13 @@ class BootloaderCommand extends AbstractCommand
     /**
      * Create bootloader declaration.
      */
-    public function perform(): void
+    public function perform(): int
     {
         /** @var BootloaderDeclaration $declaration */
         $declaration = $this->createDeclaration();
 
         $this->writeDeclaration($declaration);
+
+        return self::SUCCESS;
     }
 }

src/Scaffolder/src/Command/CommandCommand.php

@@ -1,13 +1,5 @@
 <?php
 
-/**
- * Spiral Framework. Scaffolder
- *
- * @license MIT
- * @author  Anton Titov (Wolfy-J)
- * @author  Valentin V (vvval)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Scaffolder\Command;
@@ -44,7 +36,7 @@ class CommandCommand extends AbstractCommand
     /**
      * Create command declaration.
      */
-    public function perform(): void
+    public function perform(): int
     {
         /** @var CommandDeclaration $declaration */
         $declaration = $this->createDeclaration();
@@ -53,5 +45,7 @@ public function perform(): void
         $declaration->setDescription((string)$this->option('description'));
 
         $this->writeDeclaration($declaration);
+
+        return self::SUCCESS;
     }
 }

src/Scaffolder/src/Command/ConfigCommand.php

@@ -1,12 +1,5 @@
 <?php
 
-/**
- * Spiral Framework. Scaffolder
- *
- * @license MIT
- * @author  Valentin V (vvval)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Scaffolder\Command;
@@ -47,12 +40,14 @@ class ConfigCommand extends AbstractCommand
     /**
      * Create config declaration.
      */
-    public function perform(): void
+    public function perform(): int
     {
         /** @var ConfigDeclaration $declaration */
         $declaration = $this->createDeclaration(['configName' => $this->argument('name')]);
         $declaration->create((bool)$this->option('reverse'));
 
         $this->writeDeclaration($declaration);
+
+        return self::SUCCESS;
     }
 }

src/Scaffolder/src/Command/ControllerCommand.php

@@ -1,13 +1,5 @@
 <?php
 
-/**
- * Spiral Framework. Scaffolder
- *
- * @license MIT
- * @author  Anton Titov (Wolfy-J)
- * @author  Valentin V (vvval)
- */
-
 declare(strict_types=1);
 
 namespace Spiral\Scaffolder\Command;
@@ -49,7 +41,7 @@ class ControllerCommand extends AbstractCommand
     /**
      * Create controller declaration.
      */
-    public function perform(): void
+    public function perform(): int
     {
         /** @var ControllerDeclaration $declaration */
         $declaration = $this->createDeclaration();
@@ -63,5 +55,7 @@ public function perform(): void
         }
 
         $this->writeDeclaration($declaration);
+
+        return self::SUCCESS;
     }
 }