Skip to content

Commit 9fef192

Browse files
authored
Merge pull request #8 from KaririCode-Framework/develop
Develop
2 parents a40bf6c + 6232042 commit 9fef192

File tree

5 files changed

+16
-58
lines changed

5 files changed

+16
-58
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ jobs:
2323
run: composer install --no-interaction --prefer-dist --optimize-autoloader
2424

2525
- name: Initialize devkit
26-
run: vendor/bin/kcode init
26+
run: php bin/kcode init
2727

2828
- name: Code style check
29-
run: vendor/bin/kcode cs:fix --check
29+
run: php bin/kcode cs:fix --check
3030

3131
- name: Static analysis
32-
run: vendor/bin/kcode analyse
32+
run: php bin/kcode analyse
3333

3434
- name: Tests
35-
run: vendor/bin/kcode test --coverage
35+
run: php bin/kcode test --coverage
3636

3737
build-phar:
3838
name: PHAR Build Smoke Test

.github/workflows/code-quality.yml

Lines changed: 8 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,6 @@ jobs:
3232
- name: Validate composer.json
3333
run: composer validate --strict --no-check-lock
3434

35-
- name: Get Composer cache directory
36-
id: composer-cache
37-
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
38-
39-
- name: Cache dependencies
40-
uses: actions/cache@v4
41-
with:
42-
path: ${{ steps.composer-cache.outputs.dir }}
43-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
44-
restore-keys: ${{ runner.os }}-composer-
45-
4635
- name: Install dependencies
4736
run: composer install --prefer-dist --no-progress --no-scripts
4837

@@ -65,19 +54,8 @@ jobs:
6554
tools: composer:v2
6655
coverage: none
6756

68-
- name: Get Composer cache directory
69-
id: composer-cache
70-
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
71-
72-
- name: Cache dependencies
73-
uses: actions/cache@v4
74-
with:
75-
path: ${{ steps.composer-cache.outputs.dir }}
76-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
77-
restore-keys: ${{ runner.os }}-composer-
78-
79-
- name: Install dependencies (no-dev for audit)
80-
run: composer install --no-dev --prefer-dist --no-progress
57+
- name: Install dependencies
58+
run: composer install --prefer-dist --no-progress --no-scripts
8159

8260
- name: Run composer audit
8361
run: composer audit --format=plain
@@ -98,25 +76,14 @@ jobs:
9876
coverage: none
9977
tools: composer:v2
10078

101-
- name: Get Composer cache directory
102-
id: composer-cache
103-
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
104-
105-
- name: Cache dependencies
106-
uses: actions/cache@v4
107-
with:
108-
path: ${{ steps.composer-cache.outputs.dir }}
109-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
110-
restore-keys: ${{ runner.os }}-composer-
111-
11279
- name: Install dependencies
113-
run: composer install --prefer-dist --no-progress
80+
run: composer install --prefer-dist --no-progress --no-scripts
11481

11582
- name: Initialize devkit config
116-
run: vendor/bin/kcode init
83+
run: php bin/kcode init
11784

11885
- name: Run PHPStan via kcode
119-
run: vendor/bin/kcode analyse
86+
run: php bin/kcode analyse
12087

12188
# ============================================================================
12289
# CODE STYLE (PHP CS Fixer via kcode)
@@ -134,25 +101,14 @@ jobs:
134101
coverage: none
135102
tools: composer:v2
136103

137-
- name: Get Composer cache directory
138-
id: composer-cache
139-
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
140-
141-
- name: Cache dependencies
142-
uses: actions/cache@v4
143-
with:
144-
path: ${{ steps.composer-cache.outputs.dir }}
145-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
146-
restore-keys: ${{ runner.os }}-composer-
147-
148104
- name: Install dependencies
149-
run: composer install --prefer-dist --no-progress
105+
run: composer install --prefer-dist --no-progress --no-scripts
150106

151107
- name: Initialize devkit config
152-
run: vendor/bin/kcode init
108+
run: php bin/kcode init
153109

154110
- name: Check code style via kcode
155-
run: vendor/bin/kcode cs:fix --check
111+
run: php bin/kcode cs:fix --check
156112

157113
# ============================================================================
158114
# QUALITY SUMMARY

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"php": ">=8.4"
2828
},
2929
"require-dev": {
30-
"phpunit/phpunit": "^12.0",
31-
"phpstan/phpstan": "^2.0",
3230
"friendsofphp/php-cs-fixer": "^3.64",
31+
"phpstan/phpstan": "^2.0",
32+
"phpunit/phpunit": "^12.5.8",
3333
"rector/rector": "^2.0",
3434
"vimeo/psalm": "^6.0"
3535
},

src/Core/ProcessExecutor.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ public function resolveBinary(string $vendorBin): ?string
9999

100100
// Tier 3: Global PATH
101101
$basename = basename($vendorBin);
102+
/** @psalm-suppress ForbiddenCode — shell_exec is intentional for binary resolution; input is escaped */
102103
$globalBin = trim((string) shell_exec('command -v ' . escapeshellarg($basename) . ' 2>/dev/null'));
103104
if ('' !== $globalBin && is_executable($globalBin)) {
104105
return $globalBin;

src/Runner/ComposerAuditRunner.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ protected function defaultArguments(): array
3939
#[\Override]
4040
protected function binary(): ?string
4141
{
42+
/** @psalm-suppress ForbiddenCode — shell_exec is intentional for binary resolution; input is escaped */
4243
$global = trim((string) shell_exec('command -v ' . escapeshellarg('composer') . ' 2>/dev/null'));
4344

4445
if ('' !== $global && is_executable($global)) {

0 commit comments

Comments
 (0)