Apply PHP 8.0 Syntax and constructor promotion

Signed-off-by: Abdul Malik Ikhsan <[email protected]>
laminas-api-tools · Jan 9, 2023 · a6093ed · a6093ed
1 parent 4a0e201
commit a6093ed
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 32 deletions.
diff --git a/src/AssetInstaller.php b/src/AssetInstaller.php
@@ -36,19 +36,11 @@ class AssetInstaller
 {
     use UnparseableTokensTrait;
 
-    /** @var Composer */
-    private $composer;
-
-    /** @var IOInterface */
-    private $io;
-
     /** @var string Base path for project; default is current working dir. */
     private $projectPath;
 
-    public function __construct(Composer $composer, IOInterface $io)
+    public function __construct(private Composer $composer, private IOInterface $io)
     {
-        $this->composer    = $composer;
-        $this->io          = $io;
         $this->projectPath = getcwd();
     }
 

diff --git a/src/AssetUninstaller.php b/src/AssetUninstaller.php
@@ -32,22 +32,14 @@ class AssetUninstaller
 {
     use UnparseableTokensTrait;
 
-    /** @var Composer */
-    private $composer;
-
     /** @var string[] .gitignore rules */
-    private $gitignore = [];
-
-    /** @var IOInterface */
-    private $io;
+    private array $gitignore = [];
 
     /** @var string Base path for project; default is current working dir. */
     private $projectPath;
 
-    public function __construct(Composer $composer, IOInterface $io)
+    public function __construct(private Composer $composer, private IOInterface $io)
     {
-        $this->composer    = $composer;
-        $this->io          = $io;
         $this->projectPath = getcwd();
     }
 

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -18,18 +18,16 @@
 
 class Plugin implements PluginInterface, EventSubscriberInterface
 {
-    /** @var Composer */
-    private $composer;
+    private Composer $composer;
 
     /**
      * Array of installers to run following a dump-autoload operation.
      *
      * @var callable[]
      */
-    private $installers = [];
+    private array $installers = [];
 
-    /** @var IOInterface */
-    private $io;
+    private IOInterface $io;
 
     /**
      * Provide composer event listeners.

diff --git a/test/AssetInstallerTest.php b/test/AssetInstallerTest.php
@@ -51,8 +51,7 @@ class AssetInstallerTest extends TestCase
     /** @var IOInterface|ObjectProphecy */
     private $io;
 
-    /** @var vfsStreamDirectory */
-    private $filesystem;
+    private vfsStreamDirectory $filesystem;
 
     public function setUp(): void
     {

diff --git a/test/AssetUninstallerTest.php b/test/AssetUninstallerTest.php
@@ -83,8 +83,7 @@ class AssetUninstallerTest extends TestCase
         ],
     ];
 
-    /** @var vfsStreamDirectory */
-    private $filesystem;
+    private vfsStreamDirectory $filesystem;
 
     /** @var PackageInterface|ObjectProphecy */
     private $package;

diff --git a/test/PluginTest.php b/test/PluginTest.php
@@ -24,8 +24,7 @@ class PluginTest extends TestCase
     use DeprecatedAssertionsTrait;
     use ProphecyTrait;
 
-    /** @var vfsStreamDirectory */
-    private $filesystem;
+    private vfsStreamDirectory $filesystem;
 
     /** @var Composer|ObjectProphecy */
     private $composer;
@@ -102,10 +101,10 @@ public function testOnPostAutoloadDumpTriggersInstallers(): void
         /** @psalm-var object{operations: array<array-key,string>} $obj */
         $spy = (object) ['operations' => []];
 
-        $installer1 = function () use ($spy): void {
+        $installer1 = static function () use ($spy): void {
             $spy->operations[] = 'installer1';
         };
-        $installer2 = function () use ($spy): void {
+        $installer2 = static function () use ($spy): void {
             $spy->operations[] = 'installer2';
         };