Refactor: use new in declaration defaults

przepompownia · dantleech · commit 3f3d9aba282b · 2025-12-16T16:00:40.000Z
diff --git a/lib/Adapter/DTL/DTLArgumentResolver.php b/lib/Adapter/DTL/DTLArgumentResolver.php
@@ -11,16 +11,11 @@
 
 final class DTLArgumentResolver implements ArgumentResolver
 {
-    /**
-     * @var UpstreamArgumentResolver
-     */
-    private $dtlArgumnetResolver;
-
-    public function __construct(?UpstreamArgumentResolver $dtlArgumnetResolver = null)
+    public function __construct(private UpstreamArgumentResolver $dtlArgumnetResolver = new UpstreamArgumentResolver(
+        [new RecursiveInstantiator()],
+        UpstreamArgumentResolver::ALLOW_UNKNOWN_ARGUMENTS | UpstreamArgumentResolver::MATCH_TYPE
+    ))
     {
-        $this->dtlArgumnetResolver = $dtlArgumnetResolver ?: new UpstreamArgumentResolver([
-            new RecursiveInstantiator()
-        ], UpstreamArgumentResolver::ALLOW_UNKNOWN_ARGUMENTS | UpstreamArgumentResolver::MATCH_TYPE);
     }
 
     public function resolveArguments(object $object, string $method, Message $message): array
diff --git a/lib/Core/Handler/HandlerMethodRunner.php b/lib/Core/Handler/HandlerMethodRunner.php
@@ -17,35 +17,17 @@
 
 final class HandlerMethodRunner implements MethodRunner
 {
-    /**
-     * @var HandlerMethodResolver
-     */
-    private $resolver;
-
     /**
      * @var array<string|int, CancellationTokenSource>
      */
     private $cancellations = [];
 
-    /**
-     * @var LoggerInterface
-     */
-    private $logger;
-
-    /**
-     * @var ArgumentResolver
-     */
-    private $argumentResolver;
-
     public function __construct(
         private Handlers $handlers,
-        ?ArgumentResolver $argumentResolver = null,
-        ?LoggerInterface $logger = null,
-        ?HandlerMethodResolver $resolver = null
+        private ArgumentResolver $argumentResolver = new PassThroughArgumentResolver(),
+        private LoggerInterface $logger = new NullLogger(),
+        private HandlerMethodResolver $resolver = new HandlerMethodResolver(),
     ) {
-        $this->resolver = $resolver ?: new HandlerMethodResolver();
-        $this->logger = $logger ?: new NullLogger();
-        $this->argumentResolver = $argumentResolver ?: new PassThroughArgumentResolver();
     }
 
     /**
diff --git a/lib/Core/Server/Initializer/PredefinedInitializer.php b/lib/Core/Server/Initializer/PredefinedInitializer.php
@@ -13,14 +13,8 @@
  */
 final class PredefinedInitializer implements Initializer
 {
-    /**
-     * @var InitializeParams
-     */
-    private $params;
-
-    public function __construct(?InitializeParams $params = null)
+    public function __construct(private InitializeParams $params = new InitializeParams(new ClientCapabilities()))
     {
-        $this->params = $params ?: new InitializeParams(new ClientCapabilities());
     }
 
     /**
diff --git a/lib/Core/Server/LanguageServer.php b/lib/Core/Server/LanguageServer.php
@@ -35,19 +35,13 @@ final class LanguageServer
      */
     private $connections = [];
 
-    /**
-     * @var ServerStats
-     */
-    private $stats;
-
     public function __construct(
         private DispatcherFactory $dispatcherFactory,
         private LoggerInterface $logger,
         private StreamProvider $streamProvider,
         private Initializer $initializer,
-        ?ServerStats $stats = null
+        private ServerStats $stats = new ServerStats()
     ) {
-        $this->stats = $stats ?: new ServerStats();
     }
 
     /**
diff --git a/lib/Core/Server/Parser/LspMessageReader.php b/lib/Core/Server/Parser/LspMessageReader.php
@@ -31,11 +31,8 @@ final class LspMessageReader implements RequestReader
      */
     private $headers = null;
 
-    private LoggerInterface $logger;
-
-    public function __construct(private InputStream $stream, ?LoggerInterface $logger = null)
+    public function __construct(private InputStream $stream, private LoggerInterface $logger = new NullLogger())
     {
-        $this->logger = $logger ?: new NullLogger();
     }
 
     public function wait(): Promise
diff --git a/lib/Core/Server/ResponseWatcher/TestResponseWatcher.php b/lib/Core/Server/ResponseWatcher/TestResponseWatcher.php
@@ -9,19 +9,13 @@
 
 final class TestResponseWatcher implements ResponseWatcher
 {
-    /**
-     * @var ResponseWatcher
-     */
-    private $innerWatcher;
-
     /**
      * @var array
      */
     private $requestIds = [];
 
-    public function __construct(?ResponseWatcher $innerWatcher = null)
+    public function __construct(private ResponseWatcher $innerWatcher = new DeferredResponseWatcher())
     {
-        $this->innerWatcher = $innerWatcher ?: new DeferredResponseWatcher();
     }
 
     public function handle(ResponseMessage $response): void
diff --git a/lib/Core/Server/Transmitter/ConnectionMessageTransmitter.php b/lib/Core/Server/Transmitter/ConnectionMessageTransmitter.php
@@ -9,14 +9,10 @@ final class ConnectionMessageTransmitter implements MessageTransmitter
 {
     private const WRITE_CHUNK_SIZE = 256;
 
-    /**
-     * @var MessageFormatter
-     */
-    private $formatter;
-
-    public function __construct(private Connection $connection, ?MessageFormatter $formatter = null)
-    {
-        $this->formatter = $formatter ?: new LspMessageFormatter();
+    public function __construct(
+        private Connection $connection,
+        private MessageFormatter $formatter = new LspMessageFormatter(),
+    ) {
     }
 
     public function transmit(Message $response): void
diff --git a/lib/Core/Server/Transmitter/LanguageServerMessageFormatter.php b/lib/Core/Server/Transmitter/LanguageServerMessageFormatter.php
@@ -6,14 +6,8 @@
 
 final class LanguageServerMessageFormatter implements MessageFormatter
 {
-    /**
-     * @var MessageSerializer
-     */
-    private $serializer;
-
-    public function __construct(?MessageSerializer $serializer = null)
+    public function __construct(private MessageSerializer $serializer = new LspMessageSerializer())
     {
-        $this->serializer = $serializer ?: new LspMessageSerializer();
     }
 
     public function format(Message $message): string
diff --git a/lib/Core/Server/Transmitter/LspMessageFormatter.php b/lib/Core/Server/Transmitter/LspMessageFormatter.php
@@ -6,14 +6,8 @@
 
 final class LspMessageFormatter implements MessageFormatter
 {
-    /**
-     * @var MessageSerializer
-     */
-    private $serializer;
-
-    public function __construct(?MessageSerializer $serializer = null)
+    public function __construct(private MessageSerializer $serializer = new LspMessageSerializer())
     {
-        $this->serializer = $serializer ?: new LspMessageSerializer();
     }
 
     public function format(Message $message): string
diff --git a/lib/Core/Workspace/Workspace.php b/lib/Core/Workspace/Workspace.php
@@ -27,11 +27,8 @@ class Workspace implements Countable, IteratorAggregate
      */
     private $documentVersions = [];
 
-    private LoggerInterface $logger;
-
-    public function __construct(?LoggerInterface $logger = null)
+    public function __construct(private LoggerInterface $logger = new NullLogger())
     {
-        $this->logger = $logger ?: new NullLogger();
     }
 
     public function has(string $uri): bool
diff --git a/lib/Handler/System/ExitHandler.php b/lib/Handler/System/ExitHandler.php
@@ -13,12 +13,10 @@
 
 class ExitHandler implements Handler
 {
-    private EventDispatcherInterface $eventDispatcher;
-
-
-    public function __construct(?EventDispatcherInterface $eventDispatcher = null, private int $gracePeriod = 500)
-    {
-        $this->eventDispatcher = $eventDispatcher ?: new NullEventDispatcher();
+    public function __construct(
+        private EventDispatcherInterface $eventDispatcher = new NullEventDispatcher(),
+        private int $gracePeriod = 500,
+    ) {
     }
 
     public function methods(): array
diff --git a/lib/Handler/TextDocument/CodeActionHandler.php b/lib/Handler/TextDocument/CodeActionHandler.php
@@ -20,11 +20,11 @@
 
 class CodeActionHandler implements Handler, CanRegisterCapabilities
 {
-    private ProgressNotifier $notifier;
-
-    public function __construct(private CodeActionProvider $provider, private Workspace $workspace, ?ProgressNotifier $notifier = null)
-    {
-        $this->notifier = $notifier ?: new SilentWorkDoneProgressNotifier();
+    public function __construct(
+        private CodeActionProvider $provider,
+        private Workspace $workspace,
+        private ProgressNotifier $notifier = new SilentWorkDoneProgressNotifier(),
+    ) {
     }
 
     /**
diff --git a/lib/Handler/TextDocument/FormattingHandler.php b/lib/Handler/TextDocument/FormattingHandler.php
@@ -18,11 +18,11 @@
 
 class FormattingHandler implements Handler, CanRegisterCapabilities
 {
-    private ProgressNotifier $notifier;
-
-    public function __construct(private Workspace $workspace, private Formatter $formatter, ?ProgressNotifier $notifier = null)
-    {
-        $this->notifier = $notifier ?: new SilentWorkDoneProgressNotifier();
+    public function __construct(
+        private Workspace $workspace,
+        private Formatter $formatter,
+        private ProgressNotifier $notifier = new SilentWorkDoneProgressNotifier(),
+    ) {
     }
 
     public function methods(): array
diff --git a/lib/LanguageServerBuilder.php b/lib/LanguageServerBuilder.php
@@ -29,20 +29,22 @@ final class LanguageServerBuilder
      */
     private $stats = null;
 
-    private function __construct(private DispatcherFactory $dispatcherFactory, private LoggerInterface $logger)
-    {
+    private function __construct(
+        private DispatcherFactory $dispatcherFactory,
+        private LoggerInterface $logger = new NullLogger(),
+    ) {
     }
 
     /**
      * Create a new instance of the builder \o/
      */
     public static function create(
         DispatcherFactory $dispatcherFactory,
-        ?LoggerInterface $logger = null
+        LoggerInterface $logger = new NullLogger()
     ): self {
         return new self(
             $dispatcherFactory,
-            $logger ?: new NullLogger()
+            $logger
         );
     }
 
@@ -69,9 +71,9 @@ public function tcpServer(?string $address = '0.0.0.0:0'): self
      *
      * This is useful for integration testing scenarios.
      */
-    public function tester(?InitializeParams $params = null): LanguageServerTester
-    {
-        $params = $params ?: new InitializeParams(new ClientCapabilities());
+    public function tester(
+        InitializeParams $params = new InitializeParams(new ClientCapabilities()),
+    ): LanguageServerTester {
         return new LanguageServerTester($this->dispatcherFactory, $params);
     }
 
diff --git a/lib/Middleware/ShutdownMiddleware.php b/lib/Middleware/ShutdownMiddleware.php
@@ -25,12 +25,12 @@ final class ShutdownMiddleware implements Middleware
     const METHOD_SHUTDOWN = 'shutdown';
     const METHOD_EXIT = 'exit';
 
-    private EventDispatcherInterface $eventDispatcher;
     private bool $shuttingDown = false;
 
-    public function __construct(?EventDispatcherInterface $eventDispatcher = null, private int $gracePeriod = 500)
-    {
-        $this->eventDispatcher = $eventDispatcher ?: new NullEventDispatcher();
+    public function __construct(
+        private EventDispatcherInterface $eventDispatcher = new NullEventDispatcher(),
+        private int $gracePeriod = 500,
+    ) {
     }
 
     public function process(Message $request, RequestHandler $handler): Promise
diff --git a/lib/Service/DiagnosticsService.php b/lib/Service/DiagnosticsService.php
@@ -15,20 +15,14 @@
 
 class DiagnosticsService implements ServiceProvider, ListenerProviderInterface
 {
-    /**
-     * @var Workspace
-     */
-    private $workspace;
-
     public function __construct(
         private DiagnosticsEngine $engine,
         private bool $lintOnUpdate = true,
         private bool $lintOnSave = true,
-        ?Workspace $workspace = null,
+        private Workspace $workspace = new Workspace(),
         private bool $clearOnUpdate = true,
         private bool $lintOnOpen = true
     ) {
-        $this->workspace = $workspace ?: new Workspace();
     }
 
     /**
diff --git a/lib/Test/LanguageServerTester.php b/lib/Test/LanguageServerTester.php
@@ -22,32 +22,18 @@
 
 final class LanguageServerTester
 {
-    /**
-     * @var TestMessageTransmitter
-     */
-    private $transmitter;
-
     /**
      * @var Dispatcher
      */
     private $dispatcher;
 
-    /**
-     * @var MessageSerializer
-     */
-    private $messageSerializer;
-
-    /**
-     * @var InitializeParams
-     */
-    private $initializeParams;
-
-    public function __construct(DispatcherFactory $factory, InitializeParams $params, ?TestMessageTransmitter $transmitter = null)
-    {
-        $this->initializeParams = $params;
-        $this->transmitter = $transmitter ?: new TestMessageTransmitter();
-        $this->dispatcher = $factory->create($this->transmitter, $params);
-        $this->messageSerializer = new LspMessageSerializer();
+    public function __construct(
+        DispatcherFactory $factory,
+        private InitializeParams $initializeParams,
+        private TestMessageTransmitter $transmitter = new TestMessageTransmitter(),
+        private MessageSerializer $messageSerializer = new LspMessageSerializer(),
+    ) {
+        $this->dispatcher = $factory->create($this->transmitter, $initializeParams);
     }
 
     /**
diff --git a/tests/Integration/Core/Server/LanguageServerTest.php b/tests/Integration/Core/Server/LanguageServerTest.php
@@ -79,9 +79,11 @@ function (Message $message) {
      * @return Promise<string>
      * @param Closure(Message): Promise<ResponseMessage|null> $handler
      */
-    private function dispatchRequest(RequestMessage $request, Closure $handler, ?MessageSerializer $serializer = null): Promise
-    {
-        $serializer = $serializer ?: new LspMessageSerializer();
+    private function dispatchRequest(
+        RequestMessage $request,
+        Closure $handler,
+        ?MessageSerializer $serializer = new LspMessageSerializer(),
+    ): Promise {
         return call(function () use ($handler, $request, $serializer) {
             $this->setTimeout(100);
 
diff --git a/tests/Unit/Test/LanguageServerTesterTest.php b/tests/Unit/Test/LanguageServerTesterTest.php
@@ -116,7 +116,7 @@ public function testInitialize(): void
 
     private function createTester(?InitializeParams $params = null): LanguageServerTester
     {
-        $params = $params ?: ProtocolFactory::initializeParams();
+        $params ??= ProtocolFactory::initializeParams();
         $builder = LanguageServerTesterBuilder::create();
         $builder->setInitializeParams($params);
         $builder->enableTextDocuments();

Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,11 @@`
`11`	`11`
`12`	`12`	`final class DTLArgumentResolver implements ArgumentResolver`
`13`	`13`	`{`
`14`		`- /**`
`15`		`- * @var UpstreamArgumentResolver`
`16`		`- */`
`17`		`- private $dtlArgumnetResolver;`
`18`		`-`
`19`		`- public function __construct(?UpstreamArgumentResolver $dtlArgumnetResolver = null)`
	`14`	`+ public function __construct(private UpstreamArgumentResolver $dtlArgumnetResolver = new UpstreamArgumentResolver(`
	`15`	`+ [new RecursiveInstantiator()],`
	`16`	`+ UpstreamArgumentResolver::ALLOW_UNKNOWN_ARGUMENTS \| UpstreamArgumentResolver::MATCH_TYPE`
	`17`	`+ ))`
`20`	`18`	`{`
`21`		`- $this->dtlArgumnetResolver = $dtlArgumnetResolver ?: new UpstreamArgumentResolver([`
`22`		`- new RecursiveInstantiator()`
`23`		`- ], UpstreamArgumentResolver::ALLOW_UNKNOWN_ARGUMENTS \| UpstreamArgumentResolver::MATCH_TYPE);`
`24`	`19`	`}`
`25`	`20`
`26`	`21`	`public function resolveArguments(object $object, string $method, Message $message): array`
Original file line number	Diff line number	Diff line change
`@@ -13,14 +13,8 @@`
`13`	`13`	`*/`
`14`	`14`	`final class PredefinedInitializer implements Initializer`
`15`	`15`	`{`
`16`		`- /**`
`17`		`- * @var InitializeParams`
`18`		`- */`
`19`		`- private $params;`
`20`		`-`
`21`		`- public function __construct(?InitializeParams $params = null)`
	`16`	`+ public function __construct(private InitializeParams $params = new InitializeParams(new ClientCapabilities()))`
`22`	`17`	`{`
`23`		`- $this->params = $params ?: new InitializeParams(new ClientCapabilities());`
`24`	`18`	`}`
`25`	`19`
`26`	`20`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,8 @@ final class LspMessageReader implements RequestReader`
`31`	`31`	`*/`
`32`	`32`	`private $headers = null;`
`33`	`33`
`34`		`- private LoggerInterface $logger;`
`35`		`-`
`36`		`- public function __construct(private InputStream $stream, ?LoggerInterface $logger = null)`
	`34`	`+ public function __construct(private InputStream $stream, private LoggerInterface $logger = new NullLogger())`
`37`	`35`	`{`
`38`		`- $this->logger = $logger ?: new NullLogger();`
`39`	`36`	`}`
`40`	`37`
`41`	`38`	`public function wait(): Promise`
Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,13 @@`
`9`	`9`
`10`	`10`	`final class TestResponseWatcher implements ResponseWatcher`
`11`	`11`	`{`
`12`		`- /**`
`13`		`- * @var ResponseWatcher`
`14`		`- */`
`15`		`- private $innerWatcher;`
`16`		`-`
`17`	`12`	`/**`
`18`	`13`	`* @var array`
`19`	`14`	`*/`
`20`	`15`	`private $requestIds = [];`
`21`	`16`
`22`		`- public function __construct(?ResponseWatcher $innerWatcher = null)`
	`17`	`+ public function __construct(private ResponseWatcher $innerWatcher = new DeferredResponseWatcher())`
`23`	`18`	`{`
`24`		`- $this->innerWatcher = $innerWatcher ?: new DeferredResponseWatcher();`
`25`	`19`	`}`
`26`	`20`
`27`	`21`	`public function handle(ResponseMessage $response): void`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,8 @@`
`6`	`6`
`7`	`7`	`final class LanguageServerMessageFormatter implements MessageFormatter`
`8`	`8`	`{`
`9`		`- /**`
`10`		`- * @var MessageSerializer`
`11`		`- */`
`12`		`- private $serializer;`
`13`		`-`
`14`		`- public function __construct(?MessageSerializer $serializer = null)`
	`9`	`+ public function __construct(private MessageSerializer $serializer = new LspMessageSerializer())`
`15`	`10`	`{`
`16`		`- $this->serializer = $serializer ?: new LspMessageSerializer();`
`17`	`11`	`}`
`18`	`12`
`19`	`13`	`public function format(Message $message): string`
Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,8 @@`
`6`	`6`
`7`	`7`	`final class LspMessageFormatter implements MessageFormatter`
`8`	`8`	`{`
`9`		`- /**`
`10`		`- * @var MessageSerializer`
`11`		`- */`
`12`		`- private $serializer;`
`13`		`-`
`14`		`- public function __construct(?MessageSerializer $serializer = null)`
	`9`	`+ public function __construct(private MessageSerializer $serializer = new LspMessageSerializer())`
`15`	`10`	`{`
`16`		`- $this->serializer = $serializer ?: new LspMessageSerializer();`
`17`	`11`	`}`
`18`	`12`
`19`	`13`	`public function format(Message $message): string`
Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,8 @@ class Workspace implements Countable, IteratorAggregate`
`27`	`27`	`*/`
`28`	`28`	`private $documentVersions = [];`
`29`	`29`
`30`		`- private LoggerInterface $logger;`
`31`		`-`
`32`		`- public function __construct(?LoggerInterface $logger = null)`
	`30`	`+ public function __construct(private LoggerInterface $logger = new NullLogger())`
`33`	`31`	`{`
`34`		`- $this->logger = $logger ?: new NullLogger();`
`35`	`32`	`}`
`36`	`33`
`37`	`34`	`public function has(string $uri): bool`