Refactor: clean types

Author: przepompownia

bin/serve.php

@@ -48,14 +48,14 @@
 
 if (($argc ?? 0) === 1) {
     echo <<<DOC
-Usage: serve.php --address=127.0.0.1:9000 --type=tcp
-
-Parameters:
--a --address
-    Address of the server. (needs to be set for a tcp server)
--t --type
-    Type of server (optional, default is tcp)
-DOC;
+        Usage: serve.php --address=127.0.0.1:9000 --type=tcp
+
+        Parameters:
+        -a --address
+            Address of the server. (needs to be set for a tcp server)
+        -t --type
+            Type of server (optional, default is tcp)
+        DOC;
     exit(1);
 }
 
@@ -83,7 +83,7 @@ public function __construct()
         $this->log = fopen('phpactor-lsp.log', 'w');
     }
 
-    public function log($level, $message, array $context = [])
+    public function log($level, $message, array $context = []): void
     {
         $message = json_encode(
             [

example/server/acme-ls/AcmeLsDispatcherFactory.php

@@ -15,7 +15,6 @@
 use Phpactor\LanguageServer\Core\Dispatcher\Dispatcher;
 use Phpactor\LanguageServer\Core\Handler\HandlerMethodRunner;
 use Phpactor\LanguageServer\Core\Dispatcher\DispatcherFactory;
-use Phpactor\LanguageServer\Handler\System\ExitHandler;
 use Phpactor\LanguageServer\Handler\Workspace\CommandHandler;
 use Phpactor\LanguageServer\Middleware\ResponseHandlingMiddleware;
 use Phpactor\LanguageServer\Core\Command\CommandDispatcher;
@@ -37,14 +36,8 @@
 
 class AcmeLsDispatcherFactory implements DispatcherFactory
 {
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    public function __construct(LoggerInterface $logger)
+    public function __construct(private LoggerInterface $logger)
     {
-        $this->logger = $logger;
     }
 
     public function create(MessageTransmitter $transmitter, InitializeParams $initializeParams): Dispatcher

lib/Adapter/Psr/AggregateEventDispatcher.php

@@ -10,7 +10,7 @@ class AggregateEventDispatcher implements EventDispatcherInterface
     /**
      * @var array<ListenerProviderInterface>
      */
-    private $listnerProviders;
+    private array $listnerProviders;
 
     public function __construct(ListenerProviderInterface ...$listnerProviders)
     {

lib/Core/CodeAction/AggregateCodeActionProvider.php

@@ -48,7 +48,7 @@ public function kinds(): array
         return array_values(
             array_reduce(
                 $this->providers,
-                function (array $kinds, CodeActionProvider $provider) {
+                function (array $kinds, CodeActionProvider $provider): array {
                     return array_merge(
                         $kinds,
                         (array)array_combine($provider->kinds(), $provider->kinds())

lib/Core/Command/CommandDispatcher.php

@@ -10,15 +10,10 @@
  */
 class CommandDispatcher
 {
-    /**
-     * @var array
-     */
-    private $commandMap = [];
-
     /**
      * @param array<string,Command> $commandMap Map of command names to invokable objects
      */
-    public function __construct(array $commandMap)
+    public function __construct(private array $commandMap = [])
     {
         foreach ($commandMap as $id => $command) {
             $this->addCommand($id, $command);

lib/Core/Diagnostics/AggregateDiagnosticsProvider.php

@@ -14,7 +14,7 @@ class AggregateDiagnosticsProvider implements DiagnosticsProvider
     /**
      * @var array<DiagnosticsProvider>
      */
-    private $providers;
+    private array $providers;
 
     public function __construct(private LoggerInterface $logger, DiagnosticsProvider ...$providers)
     {
@@ -65,7 +65,7 @@ public function provideDiagnostics(TextDocumentItem $textDocument, CancellationT
     public function names(): array
     {
         return array_map(
-            fn (DiagnosticsProvider $provider) => $provider->name(),
+            fn (DiagnosticsProvider $provider): string => $provider->name(),
             $this->providers
         );
     }

lib/Core/Diagnostics/DiagnosticsEngine.php

@@ -189,10 +189,9 @@ private function isDocumentCurrent(TextDocumentItem $textDocument): bool
     }
 
     /**
-     * @param string|int $providerId
      * @return Promise<bool>
      */
-    private function awaitProviderLock($providerId): Promise
+    private function awaitProviderLock(int|string $providerId): Promise
     {
         if (!array_key_exists($providerId, $this->locks)) {
             return new Success(true);

lib/Core/Dispatcher/ArgumentResolver/ChainArgumentResolver.php

@@ -11,7 +11,7 @@ final class ChainArgumentResolver implements ArgumentResolver
     /**
      * @var array<ArgumentResolver>
      */
-    private $resolvers;
+    private array $resolvers;
 
     public function __construct(ArgumentResolver ...$resolvers)
     {

lib/Core/Dispatcher/Dispatcher/MiddlewareDispatcher.php

@@ -11,9 +11,9 @@
 final class MiddlewareDispatcher implements Dispatcher
 {
     /**
-     * @var array
+     * @var Middleware[]
      */
-    private $middleware;
+    private array $middleware;
 
     public function __construct(Middleware ...$middleware)
     {

lib/Core/Handler/ClosureHandler.php

@@ -20,10 +20,7 @@ public function methods(): array
         ];
     }
 
-    /**
-     * @return mixed
-     */
-    public function handle()
+    public function handle(): mixed
     {
         $args = func_get_args();
         return $this->closure->__invoke(...$args);