Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"laravel/pao": "^1.1.5",
"laravel/pint": "^1.32.1",
"orchestra/testbench": "^11.3",
"pestphp/pest": "^5.3.1",
"pestphp/pest": "^5.3.4",
"pestphp/pest-plugin-laravel": "^5.0.1",
"pestphp/pest-plugin-type-coverage": "^5.0.3",
"phpstan/extension-installer": "^1.4.3",
Expand Down Expand Up @@ -119,9 +119,6 @@
"laravel/mcp": "Required for the MCP request, tool and server base classes (^1.0).",
"laravel/ai": "Marks changes Cortex agents make through package tools with the cortex surface (^1.0)."
},
"conflict": {
"brianium/paratest": ">=7.26.1"
},
"repositories": [
{
"type": "vcs",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## D-001: Create the ticket as drafted?
- Choice: Create as drafted
- Rationale: none given (answered in RingMaster)
- Date: 2026-10-27
- Raised by: ticket

## D-002: Approve the spec 'Drop brianium/paratest conflict, require pest ^5.3.4' as written?
- Choice: Approve
- Rationale: none given (answered in RingMaster)
- Date: 2026-10-27
- Raised by: approval
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
id: 2026-10-27-1057-drop-paratest-conflict-require-pest-5-3-4
title: Drop brianium/paratest conflict, require pest ^5.3.4
status: done
created: 2026-10-27
ticket: { provider: github, key: "#7", url: https://github.com/Refactor-Circus/Keystone/issues/7 }
standards: {}
review_passes: 1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[]
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# References

- `composer.json` (`conflict` block, `pestphp/pest` constraint): the lines to change.
- Failing run: https://github.com/Refactor-Circus/Keystone/actions/runs/38594628917/job/122264936537 (shows the resolution error).
- Ticket #6 / spec `2026-10-27-1055-fix-setup-php-2-40-0-bump`: depends on this fix.
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Drop brianium/paratest conflict, require pest ^5.3.4 — Shaping Notes

## Scope

Ticket #7. Remove the `conflict: brianium/paratest >=7.26.1` block from `composer.json` and raise `pestphp/pest` to `^5.3.4`. Confirm `composer update`, `composer test` and `pest --parallel` pass, then open a PR. Out of scope: Keen's identical conflict (own job).

## Decisions

- D-001: ticket created as drafted.

## Context

The conflict was added for a Pest 5.3.1 crash in `WrapperWorker::__construct`. Pest 5.3.4 requires `paratest ^7.27.4`, so the conflict makes every dependent's `composer update` fail. CI evidence: run 38594628917 (PR #2) fails resolution with `conflicts with brianium/paratest v7.27.1 - v7.27.4` and `pestphp/pest v5.3.1 conflicts with phpunit/phpunit 13.4.5`. Raising the Pest floor to 5.3.4 fixes both. Merging this unblocks ticket #6 (Dependabot PR #2).

## Standards

None apply: the work is composer maintenance and touches no package code.
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Spec review

## Round 1

Changes to spec.md (all minor findings; open questions untouched):
- AC1: added dangling-comma/empty-key check and `composer validate`. Makes it checkable.
- AC3: now names the local command (`composer update`, `composer show brianium/paratest`) and says to record output in the PR, since composer.lock is gitignored and absent from the diff.
- New AC4: CI must resolve with a fresh lock-free `composer update` on every matrix entry (incl. prefer-lowest), since consumers get no lock.
- Old AC4/AC5 folded into AC5: `composer test` runs `pest --parallel`, so a clean parallel run is the evidence the WrapperWorker crash is gone; unrelated failures (e.g. type coverage) are reported, not fixed.
- AC6: method stated (`git diff --stat`, only composer.json, only the two edits).
- Design: removed the tracked-lock hedge; states composer.lock is gitignored with no lock diff expected; added a grep for `5.3.1`.
- Out of scope: docs, CHANGELOG and workflows unless they pin Pest 5.3.1.
- Risks: added that dependents must raise their own pest floor to ^5.3.4 (ticket #6 or per-package jobs); no Keystone code change.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Drop brianium/paratest conflict, require pest ^5.3.4

Ticket: [#7](https://github.com/Refactor-Circus/Keystone/issues/7)

## Goal
Make `composer update` resolve again for Keystone and every package that requires it, by removing the stale paratest conflict and requiring a Pest release that no longer needs it.

## Acceptance criteria
1. `composer.json` has no `conflict` entry for `brianium/paratest`, and removing the block leaves no dangling comma or empty `conflict` key. `composer validate` passes.
2. `composer.json` requires `pestphp/pest` at `^5.3.4`.
3. Locally, `composer update` completes without a resolution error, and `composer show brianium/paratest` reports a version >= 7.27.4. Record the output in the PR body (composer.lock is gitignored, so it is not in the diff).
4. The PR's CI run resolves with a fresh `composer update` (no local lock) and passes on every matrix entry, including prefer-lowest if the workflow uses it (expected to install pest 5.3.4 and paratest 7.27.4).
5. `composer test` passes. It runs `test:unit` (`pest --parallel`), so a clean parallel run with paratest >= 7.27.4 is the evidence the `WrapperWorker::__construct` crash is gone. A failure unrelated to resolution (for example `test:types` with `--min=100` after the Pest bump) is reported, not fixed in this change.
6. `git diff --stat` shows only `composer.json`, and the diff is limited to the removed conflict block and the one pest line. No other constraint, source or test file changes.

## Design
Edit `composer.json` only: delete the `conflict` block and change `"pestphp/pest": "^5.3.1"` to `"^5.3.4"`. `composer.lock` is untracked (gitignored), so run `composer update` locally to refresh it and expect no lock diff in the PR. Pest 5.3.4 requires `paratest ^7.27.4`, which carries the fix for the `WrapperWorker::__construct` crash the conflict guarded against. Run `grep -rn "5.3.1"` over docs and workflows as a check that nothing else pins the old floor.

## Out of scope
Keen's identical conflict (its own job). Merging Dependabot PR #2 (ticket #6). Docs, CHANGELOG and workflow files, unless they pin Pest 5.3.1.

## Risks and open questions
Risk: removing the conflict drops the only guard against the `WrapperWorker::__construct` crash. Keystone's require-dev floor does not propagate to dependents (Atrium, Cortex, Keen and others), so a dependent that still allows pest 5.3.1 with paratest 7.26.1 to 7.27.3 can resolve into the crash. Each dependent must raise its own `pestphp/pest` floor to `^5.3.4` (follow-up: ticket #6 or per-package jobs). No code change in Keystone.

Open questions: none. If `composer update` still fails after the change, stop and report the resolution output rather than widening constraints.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Standards for Drop brianium/paratest conflict, require pest ^5.3.4

No standards apply: the change edits composer constraints only and touches no package code.

| Standard | File | Source | Why it applies |
| --- | --- | --- | --- |
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Tasks: Drop brianium/paratest conflict, require pest ^5.3.4

## Group 1: Edit composer.json and verify resolution
depends on: none
files: composer.json
criteria: 1, 2, 3, 4, 5, 6

- [x] 1.1 Write the check first: confirm `composer.json` still has the `conflict` block for `brianium/paratest` and `pestphp/pest` at `^5.3.1` (the failing starting state), and `grep -rn "5.3.1"` over docs and workflows for other pins of the old floor
- [x] 1.2 Delete the `conflict` block from `composer.json` (no dangling comma, no empty `conflict` key) and change `"pestphp/pest": "^5.3.1"` to `"^5.3.4"`
- [x] 1.3 Run `composer validate`, then `composer update`; record `composer show brianium/paratest` (expect >= 7.27.4) for the PR body
- [x] 1.4 Check `git diff --stat` shows only `composer.json`, limited to the removed block and the one pest line
- [x] 1.5 Run `composer test`; all green (a failure unrelated to resolution, such as `test:types` after the Pest bump, is reported, not fixed here)

Criterion 4 (CI fresh-resolve on every matrix entry) is proven by the PR's CI run after the PR opens.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Verification: Drop brianium/paratest conflict, require pest ^5.3.4

Date: 2026-10-27 · Result: PASS

| Check | Result | Detail |
| --- | --- | --- |
| Criterion 1: no `conflict` block, valid JSON | pass | `composer.json` diff removes the block cleanly; `composer validate` reports the file valid (its only complaints were the stale lock, refreshed by `composer update`) |
| Criterion 2: pest `^5.3.4` | pass | `composer.json` require-dev; lock resolved `pestphp/pest v5.3.4` |
| Criterion 3: `composer update` resolves, paratest >= 7.27.4 | pass | `composer update` completed; `composer show brianium/paratest` reports `v7.27.4` |
| Criterion 4: CI fresh resolve | pending | Proven by the PR's CI run once the PR opens |
| Criterion 5: `composer test` passes | pass | phpstan 0 errors, pint passed, type coverage 100%, pest 82/82 in parallel with paratest 7.27.4 |
| Criterion 6: diff limited to `composer.json` | pass | `git diff --stat`: `composer.json` only, 1 insertion, 4 deletions (conflict block and the pest line); no other pins of 5.3.1 outside spec folders |
| Tasks | pass | every box ticked in `tasks.md` |
| Full gate | pass | `composer test` exit 0 |
| Standards drift | pass | `vendor/bin/ringside check` passed |

## Failures
None.

## Notes for the PR body
`composer show brianium/paratest` reports `v7.27.4`. `composer.lock` is gitignored, so it is not in the diff.
Loading