fix(Shape matching): #3591629 Strip `$id` as well as `id` when normalizing resolved prop schemas

Christian López Espínolarequested to merge
issue/canvas-3591629:3591629-propshape-strip-id into 1.x

Closes #3591629 (closed)

PropShape::normalizePropSchema() now strips both id and $id so the resolved $ref URI never leaks into the prop shape, on json-schema 6.8.x and 6.9.0 alike.

Testing

  • tests/src/Unit/PropShape/PropShapeNormalizeTest.php — new case fails without the fix, passes with it (version-independent).

AI disclosure

Diagnosis, fix, and tests produced with AI assistance (Claude Opus 4.8) under human review, per Drupal's policy.

Merge request reports