[rector] Apply fixes

yiisoft · Sep 27, 2022 · 57ef54c · 57ef54c
1 parent a34438f
commit 57ef54c
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 40 deletions.
diff --git a/src/CommandLoader.php b/src/CommandLoader.php
@@ -16,8 +16,6 @@
 
 final class CommandLoader implements CommandLoaderInterface
 {
-    private ContainerInterface $container;
-
     /**
      * @psalm-var array<string, array{
      *     name: non-empty-string,
@@ -38,9 +36,8 @@ final class CommandLoader implements CommandLoaderInterface
      *
      * @psalm-param array<string, class-string> $commandMap
      */
-    public function __construct(ContainerInterface $container, array $commandMap)
+    public function __construct(private ContainerInterface $container, array $commandMap)
     {
-        $this->container = $container;
         $this->setCommandMap($commandMap);
     }
 

diff --git a/src/ErrorListener.php b/src/ErrorListener.php
@@ -12,11 +12,8 @@
 
 final class ErrorListener
 {
-    private LoggerInterface $logger;
-
-    public function __construct(LoggerInterface $logger)
+    public function __construct(private LoggerInterface $logger)
     {
-        $this->logger = $logger;
     }
 
     /**
@@ -31,7 +28,7 @@ public function onError(ConsoleErrorEvent $event): void
 
         $message = sprintf(
             '%s: %s in %s:%s while running console command "%s".',
-            get_class($exception),
+            $exception::class,
             $exception->getMessage(),
             $exception->getFile(),
             $exception->getLine(),

diff --git a/src/Event/ApplicationShutdown.php b/src/Event/ApplicationShutdown.php
@@ -6,11 +6,8 @@
 
 final class ApplicationShutdown
 {
-    private int $exitCode;
-
-    public function __construct(int $exitCode)
+    public function __construct(private int $exitCode)
     {
-        $this->exitCode = $exitCode;
     }
 
     public function getExitCode(): int

diff --git a/src/Output/ConsoleBufferedOutput.php b/src/Output/ConsoleBufferedOutput.php
@@ -13,9 +13,7 @@ final class ConsoleBufferedOutput extends ConsoleOutput
     /**
      * Returns buffer content optionally clearing it.
      *
-     * @param bool $clearBuffer
      *
-     * @return string
      */
     public function fetch(bool $clearBuffer = false): string
     {

diff --git a/src/SymfonyEventDispatcher.php b/src/SymfonyEventDispatcher.php
@@ -9,11 +9,8 @@
 
 final class SymfonyEventDispatcher implements EventDispatcherInterface
 {
-    private PsrEventDispatcherInterface $dispatcher;
-
-    public function __construct(PsrEventDispatcherInterface $dispatcher)
+    public function __construct(private PsrEventDispatcherInterface $dispatcher)
     {
-        $this->dispatcher = $dispatcher;
     }
 
     /**

diff --git a/tests/ApplicationTest.php b/tests/ApplicationTest.php
@@ -125,10 +125,6 @@ public function namespaceProvider(): array
 
     /**
      * @dataProvider namespaceProvider
-     *
-     * @param string $name
-     * @param int|null $limit
-     * @param string $expected
      */
     public function testExtractNamespace(string $name, ?int $limit, string $expected): void
     {

diff --git a/tests/ExitCodeTest.php b/tests/ExitCodeTest.php
@@ -33,9 +33,6 @@ public function reasons(): array
 
     /**
      * @dataProvider reasons
-     *
-     * @param string $errorMessage
-     * @param int $reason
      */
     public function testGetReason(string $errorMessage, int $reason): void
     {

diff --git a/tests/Stub/ErrorCommand.php b/tests/Stub/ErrorCommand.php
@@ -14,11 +14,8 @@ final class ErrorCommand extends Command
     protected static $defaultName = 'error';
     protected static $defaultDescription = 'Error command tests';
 
-    private NonExistsClass $class;
-
-    public function __construct(NonExistsClass $class)
+    public function __construct(private NonExistsClass $class)
     {
-        $this->class = $class;
         parent::__construct();
     }
 

diff --git a/tests/Stub/StubCommand.php b/tests/Stub/StubCommand.php
@@ -14,8 +14,6 @@
 
 final class StubCommand extends Command
 {
-    private Application $application;
-
     protected static $defaultName = 'stub';
     protected static $defaultDescription = 'Stub command tests';
 
@@ -24,10 +22,8 @@ public function configure(): void
         $this->addOption('styled', 's', InputOption::VALUE_OPTIONAL);
     }
 
-    public function __construct(Application $application)
+    public function __construct(private Application $application)
     {
-        $this->application = $application;
-
         parent::__construct();
     }
 

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -56,8 +56,6 @@ protected function application(): Application
     /**
      * Gets an inaccessible object property.
      *
-     * @param object $object
-     * @param string $propertyName
      *
      * @return mixed
      */
@@ -80,9 +78,6 @@ protected function getInaccessibleProperty(object $object, string $propertyName)
     /**
      * Invokes an inaccessible method.
      *
-     * @param object $object
-     * @param string $method
-     * @param array $args
      *
      * @throws ReflectionException
      *