Merge pull request #16 from samsonasik/apply-php74

Apply PHP 7.4 syntax and typed property

Author: Ocramius

src/Command/EnableCommand.php

@@ -26,8 +26,7 @@ final class EnableCommand extends AbstractCommand
     /** @var null|string */
     protected static $defaultName = 'composer:autoload:enable';
 
-    /** @var MoveModuleClassFileInterface */
-    private $moduleFileMover;
+    private MoveModuleClassFileInterface $moduleFileMover;
 
     public function __construct(
         FileReaderInterface $fileReader,
@@ -72,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $resolvedModulesPath = sprintf('%s/%s', rtrim($options->projectPath, '\\/'), $options->modulesPath);
         $this->moduleFileMover->__invoke(
             $resolvedModulesPath,
-            function (string $original, string $target) use ($output): void {
+            static function (string $original, string $target) use ($output): void {
                 $output->writeln(sprintf(
                     '<info>Renamed %s to %s</info>',
                     $original,

src/Composer.php

@@ -5,6 +5,8 @@
 namespace Laminas\ComposerAutoloading;
 
 use JsonException;
+use Laminas\ComposerAutoloading\AutoloadDumpInterface;
+use Laminas\ComposerAutoloading\FileWriterInterface;
 use Webmozart\Assert\Assert;
 
 use function implode;
@@ -30,23 +32,16 @@ final class Composer
 
     private const COMPOSER_FILE = 'composer.json';
 
-    /** @var AutoloadDumpInterface */
-    private $autoloadDumper;
+    private AutoloadDumpInterface $autoloadDumper;
 
-    /** @var bool */
-    private $changed = false;
+    private bool $changed = false;
 
-    /**
-     * @var array
-     * @psalm-var array<string, mixed>
-     */
-    private $composer;
+    /** @psalm-var array<string, mixed> */
+    private array $composer;
 
-    /** @var FileWriterInterface */
-    private $fileWriter;
+    private FileWriterInterface $fileWriter;
 
-    /** @var string */
-    private $composerJsonFile;
+    private string $composerJsonFile;
 
     public function __construct(
         string $projectDir,

test/AutoloadDumpViaSystemProcessTest.php

@@ -18,7 +18,7 @@ public function testInvokesSystemCommandWithProvidedComposerWithExpectedArgument
         $dumper       = new AutoloadDumpViaSystemProcess();
 
         /** @psalm-suppress InternalProperty */
-        $dumper->systemCommand = function (string $command) use ($composerPath): void {
+        $dumper->systemCommand = static function (string $command) use ($composerPath): void {
             $expected = sprintf('%s dump-autoload', $composerPath);
             Assert::assertSame($expected, $command);
         };

test/FileReaderViaFileGetContentsTest.php

@@ -12,8 +12,7 @@
 
 class FileReaderViaFileGetContentsTest extends TestCase
 {
-    /** @var vfsStreamDirectory */
-    private $dir;
+    private vfsStreamDirectory $dir;
 
     public function setUp(): void
     {

test/FileWriterViaFilePutContentsTest.php

@@ -14,8 +14,7 @@
 
 class FileWriterViaFilePutContentsTest extends TestCase
 {
-    /** @var vfsStreamDirectory */
-    private $dir;
+    private vfsStreamDirectory $dir;
 
     public function setUp(): void
     {

test/MoveModuleClassFileViaFileOperationsTest.php

@@ -15,8 +15,7 @@
 
 class MoveModuleClassFileViaFileOperationsTest extends TestCase
 {
-    /** @var vfsStreamDirectory */
-    private $dir;
+    private vfsStreamDirectory $dir;
 
     public function setUp(): void
     {
@@ -37,7 +36,7 @@ public function setUp(): void
      */
     private function createNoopReporter(): callable
     {
-        return function (): void {
+        return static function (): void {
             Assert::fail('Reporter was reached, but should not have been');
         };
     }
@@ -47,7 +46,7 @@ private function createNoopReporter(): callable
      */
     private function createSpyReporter(string $expectedOriginal, string $expectedTarget): callable
     {
-        return function (string $original, string $target) use ($expectedOriginal, $expectedTarget): void {
+        return static function (string $original, string $target) use ($expectedOriginal, $expectedTarget): void {
             Assert::assertSame($expectedOriginal, $original, sprintf(
                 'Did not receive expected original file "%s"; received "%s"',
                 $expectedOriginal,
@@ -86,7 +85,7 @@ public function testReturnsEarlyIfTargetModuleClassFileAlreadyExists(): void
         $modulePath = $this->dir->getChild('module/TestModule');
         vfsStream::newFile('Module.php')->at($modulePath)->setContent(<<<'END'
             <?php
-            
+
             namespace TestModule;
 
             class Module
@@ -108,7 +107,7 @@ public function testMovesModuleClassFromModuleRootIntoModuleSourceDirectory(): v
         $modulePath              = $this->dir->getChild('module/TestModule');
         $moduleClassFileContents = <<<'END'
             <?php
-            
+
             namespace TestModule;
 
             class Module
@@ -143,7 +142,7 @@ public function testMovesModuleClassFromModuleRootIntoModuleSourceDirectoryAndRe
         $modulePath              = $this->dir->getChild('module/TestModule');
         $moduleClassFileContents = <<<'END'
             <?php
-            
+
             namespace TestModule;
 
             class Module
@@ -160,7 +159,7 @@ public function getConfig(): array
 
         $expectedModuleClassFileContents = <<<'END'
             <?php
-            
+
             namespace TestModule;
 
             class Module