chore: cleanup

Assisted-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: roxblnfk

.gitattributes

@@ -8,6 +8,11 @@
 *.http binary
 *.gpg binary
 
+# Version manifest: each package bumps its own line — take both sides on overlap
+# instead of raising a conflict. A trailing sentinel key keeps every real entry
+# comma-terminated so the union stays valid JSON.
+/resources/version.json merge=union
+
 # Default: nothing is included in the `composer archive` of testo/testo.
 # Re-include only the files that actually belong to the root metapackage below.
 * export-ignore

.github/release-please/sync-deps.php

@@ -51,6 +51,14 @@
 const MANIFEST = 'resources/version.json';
 const SECTIONS = ['require', 'require-dev'];
 
+/**
+ * Trailing sentinel key in the manifest. It carries no package: its only job is
+ * to keep every real entry comma-terminated so a `merge=union` of concurrent
+ * per-package version bumps (see .gitattributes) stays valid JSON. Skipped
+ * everywhere a manifest key is treated as a package path.
+ */
+const SENTINEL = '_';
+
 /**
  * The framework meta-package that plugins/bridges depend on. Unlike siblings
  * (pinned with a caret), it is refreshed with an open upper bound
@@ -74,6 +82,9 @@
 // changed, so we fall back to refreshing every package.
 $released = [];
 foreach ($manifest as $path => $version) {
+    if ($path === SENTINEL) {
+        continue;
+    }
     if (!$hasPrevious || !\array_key_exists($path, $previous) || $previous[$path] !== $version) {
         $released[$path] = true;
     }
@@ -86,7 +97,7 @@
 // The root (testo/testo) is intentionally excluded — siblings only.
 $versions = [];
 foreach ($manifest as $path => $version) {
-    if ($path === '.') {
+    if ($path === '.' || $path === SENTINEL) {
         continue;
     }
     $composer = readJson($root . "/$path/composer.json");

plugin/assert/src/Api/Builtin/ArrayType.php

@@ -46,8 +46,13 @@ public function isList(string $message = ''): static;
     /**
      * Asserts that the array holds the same elements as the expected iterable, regardless of order.
      *
-     * Both sides are canonicalized (recursively sorted, keys discarded) and then compared loosely,
-     * matching PHPUnit's {@see \PHPUnit\Framework\Assert::assertEqualsCanonicalizing()} semantics.
+     * Both sides are canonicalized (recursively sorted, keys discarded) and then compared loosely:
+     *
+     * ```php
+     * Assert::array([3, 1, 2])->sameElementsAs([1, 2, 3]);         // passes — order ignored
+     * Assert::array(['a' => 1, 'b' => 2])->sameElementsAs([2, 1]); // passes — keys ignored
+     * Assert::array([1, 2])->sameElementsAs([1, 2, 3]);            // fails — different elements
+     * ```
      *
      * @param iterable $expected The expected elements, in any order.
      * @param string $message Optional message for the assertion.

plugin/assert/src/Internal/Assertion/AssertArray.php

@@ -143,8 +143,7 @@ public function sameElementsAs(iterable $expected, string $message = ''): static
 
     /**
      * Recursively sorts an array by value and discards keys, so two arrays holding the same
-     * elements in any order (and under any keys) canonicalize to an identical shape. Mirrors the
-     * canonicalization PHPUnit applies for `assertEqualsCanonicalizing`.
+     * elements in any order (and under any keys) canonicalize to an identical shape.
      */
     private static function canonicalize(array $value): array
     {

resources/version.json

@@ -18,5 +18,6 @@
     "bridge/mockery": "0.1.2",
     "bridge/rector": "0.2.4",
     "bridge/revolt": "0.1.1",
-    "bridge/vcr": "0.1.0"
+    "bridge/vcr": "0.1.0",
+    "_": ""
 }

skills/testo-flaky-tests/SKILL.md

@@ -67,7 +67,7 @@ public function __construct(
 ) {}
 ```
 
-- `times` is the **total** number of runs. `#[Repeat(times: 3)]` runs the test three times (mirrors Kotlin's `repeat(n)` and JUnit's `@RepeatedTest(n)`). It is **not** "additional repetitions on top of one run".
+- `times` is the **total** number of runs. `#[Repeat(times: 3)]` runs the test three times. It is **not** "additional repetitions on top of one run".
 - `maxFailures` defaults to `0` — any single failure fails the whole loop.
 - Combining with `#[Retry]`: Repeat runs *inside* Retry — each retry attempt re-runs the full repeat cycle. Possible, but the semantics are subtle; surface it to the user before suggesting both.
 
@@ -91,7 +91,7 @@ Don't ship `#[Repeat(times: 50)]` long-term on a fast suite — CI cost adds up.
 ## Pitfalls
 
 - **Don't disable `markFlaky`** on `#[Retry]` / `#[Repeat]` (it defaults to `true`). Setting `markFlaky: false` is **silent rot** — a flaky test that retries to green hides the underlying defect. Only flip it off when the user explicitly asks.
-- **`Repeat(times: N)` is total runs, not extra runs.** `Repeat(times: 1)` runs the test once. People coming from older PHPUnit `@Repeat` semantics expect "additional" — they're wrong here.
+- **`Repeat(times: N)` is total runs, not extra runs.** `Repeat(times: 1)` runs the test once, `Repeat(times: 3)` runs it three times total — `N` is the run count, not a number of *additional* runs on top of the first.
 - Combining `#[Retry]` with `#[Repeat]` is allowed: Repeat runs **inside** Retry (each retry attempt re-runs the full repeat cycle). Only suggest both when the user genuinely wants that nesting.
 - A test with `Expect::exception(...)` and `#[Retry]` is almost always wrong — expected exceptions are deterministic by design.
 - Don't use retries to paper over network calls in unit tests — replace the dependency with a fake instead.

skills/testo-write-tests/SKILL.md

@@ -5,8 +5,8 @@ description: Write or modify tests in a project that uses the Testo PHP testing
 
 # Writing tests with Testo
 
-Testo is **not PHPUnit**. The attribute set, assertion facade, exception expectations, and lifecycle
-hooks are Testo's own — do not transliterate PHPUnit idioms.
+The attribute set, assertion facade, exception expectations, and lifecycle hooks are Testo's own.
+Write them the Testo way described below — don't transliterate idioms from other test frameworks.
 
 ## Before you write code
 
@@ -81,7 +81,7 @@ Assert::string($s)->contains('foo')->notContains('bar');
 Assert::int($n)->greaterThan(0)->lessThanOrEqual(100);
 Assert::numeric($n)->between(1, 100);  // int, float, or numeric string
 Assert::array($a)->hasKeys('id', 'name')->isList()->hasCount(3)->contains('x')->notContains('y');
-Assert::array($a)->sameElementsAs([3, 2, 1]);  // order-insensitive, like assertEqualsCanonicalizing
+Assert::array($a)->sameElementsAs([3, 2, 1]);  // order-insensitive, keys ignored
 Assert::object($o)->instanceOf(Foo::class)->hasProperty('id');
 Assert::json($s)->isObject()->hasKeys(['data', 'meta'])->assertPath('$.data.id', 42);
 ```
@@ -241,7 +241,7 @@ Always pass `--json` (as above) for a compact, machine-readable report that's ch
 summary plus the failed tests. Use `--log-json=build/report.json` to write it to a file while keeping
 the terminal output.
 
-Use the Testo CLI, **never** `phpunit`.
+Always run tests through the Testo CLI (`vendor/bin/testo`).
 
 ## Pitfalls
 

tests/Testo/Acceptance/SyncDepsTest.php

@@ -206,6 +206,30 @@ public function leavesUnmanagedTestoPackagesUntouched(): void
         }
     }
 
+    /**
+     * The manifest carries a trailing sentinel key (`_`) so that a `merge=union`
+     * of concurrent per-package bumps stays valid JSON. It names no package, so
+     * the synchroniser must skip it rather than try to read `_/composer.json`.
+     */
+    public function ignoresTheSentinelManifestKey(): void
+    {
+        $dir = $this->fixture(
+            ['.' => '1.0.0', 'plugin/a' => '1.2.3', '_' => ''],
+            [
+                'composer.json' => $this->composer('testo/testo', ['testo/a' => '0.1 - 1']),
+                'plugin/a/composer.json' => $this->composer('testo/a'),
+            ],
+        );
+
+        try {
+            $this->run($dir);
+
+            Assert::same($this->requireOf($dir, 'composer.json')['testo/a'], '^1.2.3');
+        } finally {
+            $this->cleanup($dir);
+        }
+    }
+
     public function isIdempotent(): void
     {
         $dir = $this->fixture(