Skip to content

Commit 898977e

Browse files
authored
Merge pull request #17 from KaririCode-Framework/develop
fix(quality): resolve cs-fixer formatting + Psalm PossiblyFalseOperand
2 parents c42ff94 + e4201cf commit 898977e

File tree

6 files changed

+32
-33
lines changed

6 files changed

+32
-33
lines changed

src/Command/InitCommand.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public function __construct(
2626
private readonly MigrationDetector $detector,
2727
) {
2828
}
29+
2930
#[\Override]
3031
public function name(): string
3132
{

src/Configuration/KcodeComposerGenerator.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323
final class KcodeComposerGenerator implements ConfigGenerator
2424
{
2525
private const array DEFAULT_TOOL_VERSIONS = [
26-
'phpunit/phpunit' => '^12.5',
27-
'phpstan/phpstan' => '^2.0',
28-
'friendsofphp/php-cs-fixer' => '^3.64',
29-
'rector/rector' => '^2.0',
30-
'vimeo/psalm' => '^6.0',
26+
'phpunit/phpunit' => '^12.5',
27+
'phpstan/phpstan' => '^2.0',
28+
'friendsofphp/php-cs-fixer' => '^3.64',
29+
'rector/rector' => '^2.0',
30+
'vimeo/psalm' => '^6.0',
3131
];
3232

3333
/** @var array<string, string> Maps devkit.php tool short-names → Composer package names */
3434
private const array TOOL_SHORT_NAME_MAP = [
35-
'phpunit' => 'phpunit/phpunit',
36-
'phpstan' => 'phpstan/phpstan',
37-
'php-cs-fixer' => 'friendsofphp/php-cs-fixer',
38-
'rector' => 'rector/rector',
39-
'psalm' => 'vimeo/psalm',
35+
'phpunit' => 'phpunit/phpunit',
36+
'phpstan' => 'phpstan/phpstan',
37+
'php-cs-fixer' => 'friendsofphp/php-cs-fixer',
38+
'rector' => 'rector/rector',
39+
'psalm' => 'vimeo/psalm',
4040
];
4141

4242
#[\Override]
@@ -57,23 +57,23 @@ public function generate(ProjectContext $context): string
5757
$require = $this->resolveVersions($context->toolVersions);
5858

5959
$manifest = [
60-
'name' => 'kariricode/devkit-tools',
60+
'name' => 'kariricode/devkit-tools',
6161
'description' => 'Dev toolchain managed by kcode — do not edit manually.',
62-
'require' => $require,
63-
'config' => [
64-
'bin-compat' => 'full',
65-
'optimize-autoloader' => true,
66-
'sort-packages' => true,
67-
'preferred-install' => 'dist',
68-
'allow-plugins' => [
62+
'require' => $require,
63+
'config' => [
64+
'bin-compat' => 'full',
65+
'optimize-autoloader' => true,
66+
'sort-packages' => true,
67+
'preferred-install' => 'dist',
68+
'allow-plugins' => [
6969
'infection/extension-installer' => false,
7070
],
7171
],
7272
'minimum-stability' => 'stable',
73-
'prefer-stable' => true,
73+
'prefer-stable' => true,
7474
];
7575

76-
return json_encode($manifest, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES) . \PHP_EOL;
76+
return (string) json_encode($manifest, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES) . \PHP_EOL;
7777
}
7878

7979
/**

src/Core/Devkit.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ public function init(string $workingDirectory = '.'): int
105105
*/
106106
public function installTools(string $workingDirectory = '.'): int
107107
{
108-
$context = $this->context($workingDirectory);
109-
$devkitDirectory = $context->devkitDir;
108+
$context = $this->context($workingDirectory);
109+
$devkitDirectory = $context->devkitDir;
110110
$composerManifestPath = $devkitDirectory . \DIRECTORY_SEPARATOR . 'composer.json';
111111

112112
if (! is_file($composerManifestPath)) {
@@ -115,7 +115,7 @@ public function installTools(string $workingDirectory = '.'): int
115115
}
116116

117117
$composerBinary = $this->composerResolver->resolve();
118-
$command = [
118+
$command = [
119119
$composerBinary,
120120
'install',
121121
'--working-dir=' . $devkitDirectory,
@@ -285,5 +285,4 @@ private function removeRecursive(string $dir): void
285285

286286
rmdir($dir);
287287
}
288-
289288
}

src/Core/ProcessExecutor.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,4 @@ public function resolveBinary(string $vendorBin): ?string
107107

108108
return null;
109109
}
110-
111110
}

tests/Unit/Configuration/KcodeComposerGeneratorTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function outputPathIsComposerJson(): void
5555
public function generateProducesValidJsonWithDefaultVersions(): void
5656
{
5757
$generator = new KcodeComposerGenerator();
58-
$output = $generator->generate($this->context);
58+
$output = $generator->generate($this->context);
5959

6060
/** @var array<string, mixed> $manifest */
6161
$manifest = json_decode($output, true, 512, \JSON_THROW_ON_ERROR);
@@ -93,7 +93,7 @@ public function generateRespectsUserToolVersionOverrides(): void
9393
);
9494

9595
$generator = new KcodeComposerGenerator();
96-
$output = $generator->generate($contextWithVersions);
96+
$output = $generator->generate($contextWithVersions);
9797

9898
/** @var array<string, mixed> $manifest */
9999
$manifest = json_decode($output, true, 512, \JSON_THROW_ON_ERROR);
@@ -109,7 +109,7 @@ public function generateRespectsUserToolVersionOverrides(): void
109109
public function generateIncludesComposerConfigSection(): void
110110
{
111111
$generator = new KcodeComposerGenerator();
112-
$output = $generator->generate($this->context);
112+
$output = $generator->generate($this->context);
113113

114114
/** @var array<string, mixed> $manifest */
115115
$manifest = json_decode($output, true, 512, \JSON_THROW_ON_ERROR);
@@ -123,7 +123,7 @@ public function generateIncludesComposerConfigSection(): void
123123
public function generateOutputEndsWithNewline(): void
124124
{
125125
$generator = new KcodeComposerGenerator();
126-
$output = $generator->generate($this->context);
126+
$output = $generator->generate($this->context);
127127

128128
$this->assertStringEndsWith(\PHP_EOL, $output);
129129
}

tests/Unit/Core/ComposerResolverTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class ComposerResolverTest extends TestCase
1616
public function resolveReturnsNonEmptyString(): void
1717
{
1818
$resolver = new ComposerResolver();
19-
$result = $resolver->resolve();
19+
$result = $resolver->resolve();
2020

2121
$this->assertIsString($result);
2222
$this->assertNotEmpty($result);
@@ -26,7 +26,7 @@ public function resolveReturnsNonEmptyString(): void
2626
public function resolveDoesNotReturnShellFragment(): void
2727
{
2828
$resolver = new ComposerResolver();
29-
$result = $resolver->resolve();
29+
$result = $resolver->resolve();
3030

3131
// Must be a single executable path — no shell fragments like "php /path/to/file"
3232
// (a shell fragment would break proc_open's array invocation)
@@ -42,7 +42,7 @@ public function resolveRespectsComposerBinaryEnvironmentVariable(): void
4242
putenv('COMPOSER_BINARY=/usr/bin/env');
4343

4444
$resolver = new ComposerResolver();
45-
$result = $resolver->resolve();
45+
$result = $resolver->resolve();
4646

4747
$this->assertSame('/usr/bin/env', $result);
4848

@@ -62,7 +62,7 @@ public function resolveIgnoresNonExecutableComposerBinaryEnvVar(): void
6262
putenv('COMPOSER_BINARY=/non/existent/path/composer');
6363

6464
$resolver = new ComposerResolver();
65-
$result = $resolver->resolve();
65+
$result = $resolver->resolve();
6666

6767
// Should fall through to PATH or fallback — not return the non-executable path
6868
$this->assertNotSame('/non/existent/path/composer', $result);

0 commit comments

Comments
 (0)