Merge 4.2

Author: soyuka

.github/workflows/ci.yml

@@ -178,6 +178,57 @@ jobs:
         run: |
           ./vendor/bin/phpstan analyse --no-interaction --no-progress --ansi
 
+  redocly-lint:
+    name: Lint OpenAPI with Redocly
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        php:
+          - '8.4'
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: intl, bcmath, curl, openssl, mbstring
+          ini-values: memory_limit=-1
+          tools: composer
+          coverage: none
+      - name: Get composer cache directory
+        id: composercache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache dependencies
+        uses: actions/cache@v5
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Update project dependencies
+        run: |
+          composer global require soyuka/pmu
+          composer global config allow-plugins.soyuka/pmu true --no-interaction
+          composer global link .
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+      - name: Install Redocly CLI
+        run: npm install -g @redocly/cli@latest
+      - name: Clear test app cache
+        run: |
+          rm -Rf tests/Fixtures/app/var/cache/*
+          tests/Fixtures/app/console cache:warmup
+      - name: Generate OpenAPI spec
+        run: |
+          mkdir -p /tmp/openapi
+          tests/Fixtures/app/console api:openapi:export --output=/tmp/openapi/openapi.json --no-ansi
+      - name: Lint OpenAPI spec with Redocly
+        run: redocly lint /tmp/openapi/openapi.json
+
   phpunit:
     name: PHPUnit (PHP ${{ matrix.php }})
     runs-on: ubuntu-latest

CHANGELOG.md

@@ -61,6 +61,16 @@
 
 * When using `output` with `itemUriTemplate` on a collection operation, the JSON-LD `@type` will now use the resource class name instead of the output DTO class name for semantic consistency with `itemUriTemplate` behavior.
 
+## v4.2.18
+
+### Bug fixes
+
+* [2e0b8ffb6](https://github.com/api-platform/core/commit/2e0b8ffb6b57ee5552ad8a48b212d8dff9de923a) fix(serializer): prevent api_platform_output context from leaking to nested non-resource objects (#7787)
+* [64247b050](https://github.com/api-platform/core/commit/64247b0505dd0bcb79e958b1f987e983eb6c3fd3) fix(metadata): sort parameters by priority after pattern expansion (#7788)
+* [90dfc3554](https://github.com/api-platform/core/commit/90dfc355496d9f6478f3085d96f146082552a9d2) fix(validator): handle nested groups and group sequences (#7784, #7791)
+* [9f1109365](https://github.com/api-platform/core/commit/9f1109365cc44a21551c77f715dcd0bbed1b161f) fix(hydra): example type - use @type prefix per JSON-LD spec (#7768)
+* [c624daf68](https://github.com/api-platform/core/commit/c624daf68e4ca5a5a0a0dcd95e61b5ea8b154958) fix(symfony): allow toggling GraphQL Playground to ensure BC
+
 ## v4.2.17
 
 ### Bug fixes
@@ -3964,4 +3974,4 @@ Please read #2825 if you have issues with the behavior of Readable/Writable Link
 ## 1.0.0 beta 2
 
 * Preserve indexes when normalizing and denormalizing associative arrays
-* Allow setting default order for property when registering a `Doctrine\Orm\Filter\OrderFilter` instance
+* Allow setting default order for property when registering a `Doctrine\Orm\Filter\OrderFilter` instance

src/Hydra/JsonSchema/SchemaFactory.php

@@ -229,7 +229,7 @@ public function buildSchema(string $className, string $format = 'jsonld', string
                                 ],
                                 'example' => [
                                     '@id' => 'string',
-                                    'type' => 'string',
+                                    '@type' => 'string',
                                     $hydraPrefix.'first' => 'string',
                                     $hydraPrefix.'last' => 'string',
                                     $hydraPrefix.'previous' => 'string',

tests/Functional/JsonSchema/JsonLdJsonSchemaTest.php

@@ -163,6 +163,26 @@ public function testSchemaJsonLdCollection(): void
         $this->assertEquals(['$ref' => '#/definitions/BagOfTests.jsonld-read'], $schema['allOf'][1]['properties']['hydra:member']['items']);
     }
 
+    public function testHydraCollectionBaseSchemaExample(): void
+    {
+        $schema = $this->schemaFactory->buildSchema(BagOfTests::class, 'jsonld', forceCollection: true);
+
+        $this->assertArrayHasKey('HydraCollectionBaseSchema', $schema['definitions']);
+        $hydraCollectionSchema = $schema['definitions']['HydraCollectionBaseSchema'];
+
+        // Navigate to the hydra:view property example
+        $this->assertArrayHasKey('allOf', $hydraCollectionSchema);
+        $viewProperty = $hydraCollectionSchema['allOf'][1]['properties']['hydra:view'] ?? null;
+        $this->assertNotNull($viewProperty, 'hydra:view property should exist');
+
+        // Check that the example uses @type instead of type
+        $this->assertArrayHasKey('example', $viewProperty);
+        $example = $viewProperty['example'];
+        $this->assertArrayHasKey('@type', $example, 'Example should use @type with @ prefix');
+        $this->assertArrayNotHasKey('type', $example, 'Example should not use type without @ prefix');
+        $this->assertArrayHasKey('@id', $example, 'Example should have @id');
+    }
+
     public function testArraySchemaWithMultipleUnionTypes(): void
     {
         $schema = $this->schemaFactory->buildSchema(Nest::class, 'jsonld', 'output');