Use new for defaults in promoted properties

See phpactor/language-server#64

Author: mamazu

lib/ClassMover/Adapter/TolerantParser/TolerantClassFinder.php

@@ -30,11 +30,8 @@
 
 class TolerantClassFinder implements ClassFinder
 {
-    private Parser $parser;
-
-    public function __construct(?Parser $parser = null)
+    public function __construct(private Parser $parser = new Parser())
     {
-        $this->parser = $parser ?: new Parser();
     }
 
     public function findIn(TextDocument $source): NamespacedClassReferences

lib/ClassMover/Adapter/WorseTolerant/WorseTolerantMemberFinder.php

@@ -45,18 +45,12 @@ class WorseTolerantMemberFinder implements MemberFinder
 {
     private Reflector $reflector;
 
-    private Parser $parser;
-
-    private LoggerInterface $logger;
-
     public function __construct(
         ?Reflector $reflector = null,
-        ?Parser $parser = null,
-        ?LoggerInterface $logger = null
+        private Parser $parser = new Parser(),
+        private LoggerInterface $logger = new NullLogger()
     ) {
         $this->reflector = $reflector ?: ReflectorBuilder::create()->addSource(TextDocumentBuilder::empty());
-        $this->parser = $parser ?: new Parser();
-        $this->logger = $logger ?: new NullLogger();
     }
 
     public function findMembers(SourceCode $source, ClassMemberQuery $query): MemberReferences

lib/ClassMover/ClassMover.php

@@ -14,14 +14,10 @@
 
 class ClassMover
 {
-    private ClassFinder $finder;
-
-    private ClassReplacer $replacer;
-
-    public function __construct(?ClassFinder $finder = null, ?ClassReplacer $replacer = null)
-    {
-        $this->finder = $finder ?: new TolerantClassFinder();
-        $this->replacer = $replacer ?: new TolerantClassReplacer(new TolerantUpdater(new TwigRenderer()));
+    public function __construct(
+        private ClassFinder $finder = new TolerantClassFinder(),
+        private ClassReplacer $replacer = new TolerantClassReplacer(new TolerantUpdater(new TwigRenderer())),
+    ) {
     }
 
     public function findReferences(string $source, string $fullyQualifiedName): FoundReferences

lib/ClassMover/Tests/Adapter/TolerantParser/TolerantClassFinderTest.php

@@ -3,7 +3,6 @@
 namespace Phpactor\ClassMover\Tests\Adapter\TolerantParser;
 
 use PHPUnit\Framework\Attributes\TestDox;
-use Microsoft\PhpParser\Parser;
 use Phpactor\ClassMover\Adapter\TolerantParser\TolerantClassFinder;
 use PHPUnit\Framework\TestCase;
 use Phpactor\TextDocument\TextDocumentBuilder;
@@ -13,8 +12,7 @@ class TolerantClassFinderTest extends TestCase
     #[TestDox('It finds all class references.')]
     public function testFind(): void
     {
-        $parser = new Parser();
-        $tolerantRefFinder = new TolerantClassFinder($parser);
+        $tolerantRefFinder = new TolerantClassFinder();
         $source = TextDocumentBuilder::fromUri(__DIR__ . '/examples/Example1.php')->build();
         $names = iterator_to_array($tolerantRefFinder->findIn($source));
 

lib/ClassMover/Tests/Adapter/TolerantParser/TolerantClassReplacerTest.php

@@ -5,7 +5,6 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\TestDox;
 use Generator;
-use Microsoft\PhpParser\Parser;
 use Phpactor\ClassMover\Adapter\TolerantParser\TolerantClassFinder;
 use PHPUnit\Framework\TestCase;
 use Phpactor\ClassMover\Adapter\TolerantParser\TolerantClassReplacer;
@@ -20,8 +19,7 @@ class TolerantClassReplacerTest extends TestCase
     #[TestDox('It finds all class references.')]
     public function testFind(string $fileName, string $classFqn, string $replaceWithFqn, string $expectedSource): void
     {
-        $parser = new Parser();
-        $tolerantRefFinder = new TolerantClassFinder($parser);
+        $tolerantRefFinder = new TolerantClassFinder();
         $source = TextDocumentBuilder::fromUri(__DIR__ . '/examples/' . $fileName)->build();
         $originalName = FullyQualifiedName::fromString($classFqn);
 

lib/CodeBuilder/Adapter/TolerantParser/Edits.php

@@ -16,11 +16,8 @@ class Edits
      */
     private array $edits = [];
 
-    private TextFormat $format;
-
-    public function __construct(?TextFormat $format = null)
+    public function __construct(private TextFormat $format = new TextFormat())
     {
-        $this->format = $format ?: new TextFormat();
     }
 
     /**

lib/CodeBuilder/Adapter/TolerantParser/TolerantUpdater.php

@@ -25,10 +25,6 @@
 
 class TolerantUpdater implements Updater
 {
-    private Parser $parser;
-
-    private TextFormat $textFormat;
-
     private ClassUpdater $classUpdater;
 
     private InterfaceUpdater $interfaceUpdater;
@@ -41,11 +37,9 @@ class TolerantUpdater implements Updater
 
     public function __construct(
         private Renderer $renderer,
-        ?TextFormat $textFormat = null,
-        ?Parser $parser = null
+        private TextFormat $textFormat = new TextFormat(),
+        private Parser $parser = new Parser()
     ) {
-        $this->parser = $parser ?: new Parser();
-        $this->textFormat = $textFormat ?: new TextFormat();
         $this->classUpdater = new ClassUpdater($renderer);
         $this->interfaceUpdater = new InterfaceUpdater($renderer);
         $this->traitUpdater = new TraitUpdater($renderer);

lib/CodeBuilder/Adapter/Twig/TwigRenderer.php

@@ -15,14 +15,11 @@ final class TwigRenderer implements Renderer
 {
     private Environment $twig;
 
-    private TemplateNameResolver $templateNameResolver;
-
     public function __construct(
         ?Environment $twig = null,
-        ?TemplateNameResolver $templateNameResolver = null
+        private TemplateNameResolver $templateNameResolver = new ClassShortNameResolver(),
     ) {
         $this->twig = $twig ?: $this->createTwig();
-        $this->templateNameResolver = $templateNameResolver ?: new ClassShortNameResolver();
     }
 
     public function render(Prototype $prototype, ?string $variant = null): Code

lib/CodeTransform/Adapter/TolerantParser/ClassToFile/Transformer/ClassNameFixerTransformer.php

@@ -31,13 +31,8 @@
 
 class ClassNameFixerTransformer implements Transformer
 {
-    private Parser $parser;
-
-    public function __construct(
-        private FileToClass $fileToClass,
-        ?Parser $parser = null
-    ) {
-        $this->parser = $parser ?: new Parser();
+    public function __construct(private FileToClass $fileToClass, private Parser $parser = new Parser())
+    {
     }
 
     /**

lib/CodeTransform/Adapter/TolerantParser/Refactor/TolerantChangeVisiblity.php

@@ -16,11 +16,8 @@
 
 class TolerantChangeVisiblity implements ChangeVisiblity
 {
-    private Parser $parser;
-
-    public function __construct(?Parser $parser = null)
+    public function __construct(private Parser $parser = new Parser())
     {
-        $this->parser = $parser ?: new Parser();
     }
 
     public function changeVisiblity(SourceCode $source, int $offset): SourceCode