Skip to content

Commit 3fe5d0f

Browse files
dantleechdantleech
authored
Update composer dependencies (#3070)
* Update composer dependencies * Apply cs fixes * Update baseline * Remove now-platform-depenedent behaviors Path handling is not done by Phpactor and the upstream (Symfony) library is now platform dependent.
1 parent a4319bd commit 3fe5d0f

23 files changed

Lines changed: 741 additions & 666 deletions

File tree

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"phpactor/amp-fswatch": "^0.3.0",
1919
"amphp/process": "^1.1.5",
2020
"phpactor/phly-event-dispatcher": "^2.2.0",
21-
"phpactor/language-server": "^7.0.1",
22-
"phpactor/language-server-protocol": "^3.17.4",
21+
"phpactor/language-server": "^8.0.0",
22+
"phpactor/language-server-protocol": "^3.17.6",
2323
"dantleech/object-renderer": "^0.1.1",
2424
"monolog/monolog": "^2.10",
2525
"sebastian/diff": "^5.0",

‎composer.lock‎

Lines changed: 583 additions & 482 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/CodeBuilder/Domain/Builder/EnumBuilder.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ public function build(): EnumPrototype
3535
$updatePolicy = UpdatePolicy::fromModifiedState($this->isModified());
3636
return new EnumPrototype(
3737
$this->name,
38-
Cases::fromCases(array_map(function (CaseBuilder $case) { return $case->build(); }, $this->cases)),
39-
Methods::fromMethods(array_map(function (MethodBuilder $builder) { return $builder->build(); }, $this->methods)),
38+
Cases::fromCases(array_map(function (CaseBuilder $case) {
39+
return $case->build();
40+
}, $this->cases)),
41+
Methods::fromMethods(array_map(function (MethodBuilder $builder) {
42+
return $builder->build();
43+
}, $this->methods)),
4044
$updatePolicy
4145
);
4246
}

‎lib/CodeBuilder/Domain/TemplatePathResolver/PhpVersionPathResolver.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ class PhpVersionPathResolver
99
/**
1010
* @see https://www.php.net/manual/en/reserved.constants.php#reserved.constants.core
1111
*/
12-
public function __construct(
13-
private string $phpVersion
14-
) {
12+
public function __construct(private string $phpVersion)
13+
{
1514
}
1615

1716
/**

‎lib/ConfigLoader/Tests/Unit/Adapter/PathCandidate/AbsolutePathCandidateTest.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,4 @@ public function testExceptionifNotAbsolute(): void
1313
$this->expectException(RuntimeException::class);
1414
new AbsolutePathCandidate('hello', 'foo');
1515
}
16-
17-
public function testNormalizesWindowsPaths(): void
18-
{
19-
$path = new AbsolutePathCandidate('c:\hello', 'foo');
20-
self::assertEquals('c:/hello', $path->path());
21-
}
2216
}

‎lib/Diff/DiffLinesConsumer.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ class DiffLinesConsumer
1111

1212
private int $position = 0;
1313

14-
public function __construct(
15-
private Chunk $chunk
16-
) {
14+
public function __construct(private Chunk $chunk)
15+
{
1716
$this->origLine = $chunk->getStart();
1817
}
1918

‎lib/Extension/CodeTransformExtra/Application/Transformer.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ class Transformer
1111
{
1212
private FilesystemHelper $filesystemHelper;
1313

14-
public function __construct(
15-
private CodeTransform $transform
16-
) {
14+
public function __construct(private CodeTransform $transform)
15+
{
1716
$this->filesystemHelper = new FilesystemHelper();
1817
}
1918

‎lib/Extension/CodeTransformExtra/Command/ClassTransformCommand.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ class ClassTransformCommand extends Command
1919
{
2020
private Differ $differ;
2121

22-
public function __construct(
23-
private Transformer $transformer
24-
) {
22+
public function __construct(private Transformer $transformer)
23+
{
2524
parent::__construct();
2625
$this->differ = new Differ(new UnifiedDiffOutputBuilder());
2726
}

‎lib/Extension/LanguageServerCodeTransform/CodeAction/OverrideMethodProvider.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616

1717
class OverrideMethodProvider implements CodeActionProvider
1818
{
19-
public function __construct(
20-
private OverridableMethodFinder $finder,
21-
) {
19+
public function __construct(private OverridableMethodFinder $finder)
20+
{
2221
}
2322

2423
public function provideActionsFor(TextDocumentItem $item, Range $range, CancellationToken $cancel): Promise

‎lib/Extension/LanguageServerPhpCsFixer/Formatter/PhpCsFixerFormatter.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@
1111

1212
class PhpCsFixerFormatter implements Formatter
1313
{
14-
public function __construct(
15-
private PhpCsFixerProcess $phpCsFixer
16-
) {
14+
public function __construct(private PhpCsFixerProcess $phpCsFixer)
15+
{
1716
}
1817

1918
public function format(TextDocumentItem $textDocument): Promise

0 commit comments

Comments
 (0)