Skip to content

Commit 96a9992

Browse files
ikidnapmyselfclaude
andcommitted
Merge branch 'master' into chore/php-linting-formatting
Resolves conflicts introduced by laravel/boost landing on master (PR #81) while this branch was still open. Combined require-dev entries (larastan/pint/phpstan-mockery + laravel/boost) and .gitignore additions from both sides; composer.lock regenerated via `composer update laravel/boost --with-all-dependencies` for internal consistency rather than hand-merging the generated lock file. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2 parents 6338c51 + c3c0f80 commit 96a9992

3 files changed

Lines changed: 426 additions & 138 deletions

File tree

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,13 @@ yarn-error.log
2020
# Premature design briefs — kept locally, not part of the repo
2121
/docs/SWINN_DESIGN*.md
2222
/storage/phpstan
23+
24+
# Laravel Boost — regenerated per-developer via `php artisan boost:install`/`boost:update`
25+
/.claude
26+
/.agents
27+
/.junie
28+
/.mcp.json
29+
/CLAUDE.md
30+
/AGENTS.md
31+
/boost.json
32+
/opencode.json

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"require-dev": {
2626
"fakerphp/faker": "^1.9.1",
2727
"larastan/larastan": "^3.10",
28+
"laravel/boost": "^2.4",
2829
"laravel/pint": "^1.29",
2930
"mockery/mockery": "^1.3.1",
3031
"nunomaduro/collision": "^8.0",

0 commit comments

Comments
 (0)