Skip to content

Commit 9d8ccb5

Browse files
authored
Merge pull request #2 from dAppCore/dev
chore(dev→main): routine PR cadence for CodeRabbit review
2 parents be304e7 + 342e8ca commit 9d8ccb5

319 files changed

Lines changed: 4136 additions & 488 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: core-lint pilot
2+
3+
on:
4+
push:
5+
branches: [main, develop, dev]
6+
pull_request:
7+
branches: [main, develop, dev]
8+
9+
# Pilot workflow that runs the core-lint orchestrator (PHPStan + Psalm via the
10+
# code/core/lint adapters) ALONGSIDE the existing native phpstan/psalm jobs in
11+
# .github/workflows/static-analysis.yml. Both must continue to run for at least
12+
# one merge cycle so the parity between native and core-lint outputs can be
13+
# diffed before native jobs are removed.
14+
#
15+
# Spec: plans/code/core/lint/RFC.md §5 (Adapter), §5.4 (Built-in Adapters)
16+
17+
jobs:
18+
core-lint:
19+
name: core-lint (pilot)
20+
runs-on: ubuntu-latest
21+
continue-on-error: true # Pilot — failures here MUST NOT block PRs.
22+
23+
steps:
24+
- name: Checkout code
25+
uses: actions/checkout@v4
26+
27+
- name: Setup PHP
28+
uses: shivammathur/setup-php@v2
29+
with:
30+
php-version: 8.3
31+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
32+
coverage: none
33+
34+
- name: Install PHP dependencies
35+
run: composer install --prefer-dist --no-interaction --no-progress
36+
37+
- name: Setup Go
38+
uses: actions/setup-go@v5
39+
with:
40+
go-version: '1.26'
41+
42+
- name: Install core-lint
43+
run: |
44+
go install dappco.re/go/lint/cmd/core-lint@latest || \
45+
go install github.com/dappcore/lint/cmd/core-lint@latest
46+
echo "$(go env GOPATH)/bin" >> "$GITHUB_PATH"
47+
48+
- name: Run core-lint (PHP, JSON for diffing)
49+
run: |
50+
core-lint run --lang php --ci --output json > core-lint-report.json || true
51+
core-lint run --lang php --output text || true
52+
53+
- name: Upload core-lint report
54+
if: always()
55+
uses: actions/upload-artifact@v4
56+
with:
57+
name: core-lint-report
58+
path: core-lint-report.json
59+
if-no-files-found: ignore

‎CLAUDE.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ src/Core/Lang/ # Translation system with ICU + locale fallback chains
7171
src/Core/Media/ # Media handling with thumbnail helpers
7272
src/Core/Search/ # Search functionality
7373
src/Core/Seo/ # SEO utilities
74-
src/Core/Service/ # Service discovery and dependency resolution
7574
src/Core/Storage/ # Storage with Redis circuit breaker + fallback
7675
src/Core/Webhook/ # Webhook system + CronTrigger scheduled action
7776
```

‎cmd/core-php/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
package main
44

55
import (
6-
php "forge.lthn.ai/core/php/pkg/php"
6+
php "dappco.re/go/php/pkg/php"
77

8-
"forge.lthn.ai/core/cli/pkg/cli"
8+
"dappco.re/go/cli/pkg/cli"
99
)
1010

1111
func main() {

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
],
1919
"require": {
2020
"php": "^8.2",
21-
"laravel/framework": "^11.0|^12.0",
21+
"laravel/framework": "^11.0|^12.0|^13.0",
2222
"laravel/pennant": "^1.0",
2323
"livewire/livewire": "^3.0|^4.0"
2424
},

‎config/core.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
use Core\Activity\Models\Activity;
4+
35
return [
46

57
/*
@@ -449,7 +451,7 @@
449451
// Custom Activity model class (optional).
450452
// Set this to use a custom Activity model with additional scopes.
451453
// Default: Core\Activity\Models\Activity::class
452-
'activity_model' => env('CORE_ACTIVITY_MODEL', \Core\Activity\Models\Activity::class),
454+
'activity_model' => env('CORE_ACTIVITY_MODEL', Activity::class),
453455
],
454456

455457
];

‎go.mod‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
1-
module forge.lthn.ai/core/php
1+
module dappco.re/go/php
22

33
go 1.26.0
44

55
require (
6-
forge.lthn.ai/core/cli v0.3.7
7-
forge.lthn.ai/core/go-i18n v0.1.7
8-
forge.lthn.ai/core/go-io v0.1.7
6+
dappco.re/go/cli v0.8.0-alpha.1
7+
dappco.re/go/i18n v0.8.0-alpha.1
8+
dappco.re/go/io v0.8.0-alpha.1
99
github.com/dunglas/frankenphp v1.12.1
1010
github.com/stretchr/testify v1.11.1
1111
gopkg.in/yaml.v3 v3.0.1
1212
)
1313

1414
require (
15-
forge.lthn.ai/core/go v0.3.3 // indirect
16-
forge.lthn.ai/core/go-inference v0.1.6 // indirect
17-
forge.lthn.ai/core/go-log v0.0.4 // indirect
15+
dappco.re/go/core v0.8.0-alpha.1
16+
dappco.re/go/api v0.8.0-alpha.1
17+
dappco.re/go/i18n v0.8.0-alpha.1
18+
dappco.re/go/io v0.8.0-alpha.1
19+
dappco.re/go/log v0.8.0-alpha.1
20+
dappco.re/go/process v0.8.0-alpha.1
21+
dappco.re/go/scm v0.8.0-alpha.1
22+
dappco.re/go/store v0.8.0-alpha.1
23+
dappco.re/go/ws v0.8.0-alpha.1
24+
dappco.re/go/core v0.8.0-alpha.1 // indirect
25+
dappco.re/go/inference v0.8.0-alpha.1 // indirect
26+
dappco.re/go/log v0.8.0-alpha.1 // indirect
1827
github.com/MauriceGit/skiplist v0.0.0-20211105230623-77f5c8d3e145 // indirect
1928
github.com/RoaringBitmap/roaring/v2 v2.15.0 // indirect
2029
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect

‎phpstan.neon‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ parameters:
1717
- src/Core/Tests
1818
- src/Core/Bouncer/Tests
1919
- src/Core/Bouncer/Gate/Tests
20-
- src/Core/Service/Tests
2120
- src/Core/Front/Tests
2221
- src/Mod/Trees
22+
# Pending Core\Service module — see plans/code/core/lint/RFC.md migration
23+
- src/Core/Cdn/Services/BunnyStorageService.php
2324
reportUnmatchedIgnoredErrors: false

‎pkg/php/cmd.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"os"
55
"path/filepath"
66

7-
"forge.lthn.ai/core/cli/pkg/cli"
8-
"forge.lthn.ai/core/go-i18n"
9-
"forge.lthn.ai/core/go-io"
7+
"dappco.re/go/cli/pkg/cli"
8+
"dappco.re/go/i18n"
9+
"dappco.re/go/io"
1010
)
1111

1212
// DefaultMedium is the default filesystem medium used by the php package.

‎pkg/php/cmd_build.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"os"
77
"strings"
88

9-
"forge.lthn.ai/core/cli/pkg/cli"
10-
"forge.lthn.ai/core/go-i18n"
9+
"dappco.re/go/cli/pkg/cli"
10+
"dappco.re/go/i18n"
1111
)
1212

1313
var (

‎pkg/php/cmd_ci.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"strings"
2222
"time"
2323

24-
"forge.lthn.ai/core/cli/pkg/cli"
25-
"forge.lthn.ai/core/go-i18n"
24+
"dappco.re/go/cli/pkg/cli"
25+
"dappco.re/go/i18n"
2626
)
2727

2828
// CI command flags

0 commit comments

Comments
 (0)