From 64d45fc1d5098d6f3bfdada021d8948f719106ab Mon Sep 17 00:00:00 2001 From: BacLuc Date: Tue, 29 Oct 2024 22:01:55 +0100 Subject: [PATCH 1/4] api: temporary downgrade symfony/framework-bundle to 7.1.5 Because 7.1.6 conflicts with api-platform/core 3.4.4 --- api/composer.json | 2 +- api/composer.lock | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/api/composer.json b/api/composer.json index 951021784f..33fed792fa 100644 --- a/api/composer.json +++ b/api/composer.json @@ -32,7 +32,7 @@ "symfony/dotenv": "7.1.6", "symfony/expression-language": "7.1.6", "symfony/flex": "2.4.7", - "symfony/framework-bundle": "7.1.6", + "symfony/framework-bundle": "7.1.5", "symfony/http-client": "7.1.6", "symfony/intl": "7.1.6", "symfony/mailer": "7.1.6", diff --git a/api/composer.lock b/api/composer.lock index d6b15d0be4..13a876df29 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ee2ae1b2cacb223215d8e05fec6ea0bb", + "content-hash": "67bbbed1bc2ae04089916522e2d01590", "packages": [ { "name": "api-platform/core", @@ -6530,16 +6530,16 @@ }, { "name": "symfony/framework-bundle", - "version": "v7.1.6", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "1d616d762905091e798d64c53ffe3840ccfc3d89" + "reference": "8a792de86230c13a9de7750c0c8b23cc083183d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/1d616d762905091e798d64c53ffe3840ccfc3d89", - "reference": "1d616d762905091e798d64c53ffe3840ccfc3d89", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/8a792de86230c13a9de7750c0c8b23cc083183d4", + "reference": "8a792de86230c13a9de7750c0c8b23cc083183d4", "shasum": "" }, "require": { @@ -6577,7 +6577,6 @@ "symfony/mime": "<6.4", "symfony/property-access": "<6.4", "symfony/property-info": "<6.4", - "symfony/runtime": "<6.4.13|>=7.0,<7.1.6", "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4", "symfony/security-core": "<6.4", "symfony/security-csrf": "<6.4", @@ -6658,7 +6657,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v7.1.6" + "source": "https://github.com/symfony/framework-bundle/tree/v7.1.5" }, "funding": [ { @@ -6674,7 +6673,7 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:11:02+00:00" + "time": "2024-09-20T13:35:23+00:00" }, { "name": "symfony/http-client", From cd09ab9c5a4bdbc17c854ffb933b8f4c70e2c135 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2024 13:12:51 +0000 Subject: [PATCH 2/4] fix(deps): update dependency api-platform/core to v3.4.4 --- api/composer.json | 2 +- api/composer.lock | 173 +++++++++++++++++++++++++++------------------- 2 files changed, 104 insertions(+), 71 deletions(-) diff --git a/api/composer.json b/api/composer.json index 33fed792fa..f82a477a9e 100644 --- a/api/composer.json +++ b/api/composer.json @@ -5,7 +5,7 @@ "php": ">=8.1.0", "ext-ctype": "*", "ext-iconv": "*", - "api-platform/core": "3.3.13", + "api-platform/core": "3.4.4", "composer/package-versions-deprecated": "1.11.99", "cweagans/composer-patches": "1.7.3", "doctrine/doctrine-bundle": "2.13.0", diff --git a/api/composer.lock b/api/composer.lock index 13a876df29..cc89678a2f 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "67bbbed1bc2ae04089916522e2d01590", + "content-hash": "437112faa264c82993f78afe824bd759", "packages": [ { "name": "api-platform/core", - "version": "v3.3.13", + "version": "v3.4.4", "source": { "type": "git", "url": "https://github.com/api-platform/core.git", - "reference": "d08d4dd2227c8f528b15d8d2513a647b1aebabc7" + "reference": "77d3ff3e8ddf88546eaf288a399d11f130553606" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/api-platform/core/zipball/d08d4dd2227c8f528b15d8d2513a647b1aebabc7", - "reference": "d08d4dd2227c8f528b15d8d2513a647b1aebabc7", + "url": "https://api.github.com/repos/api-platform/core/zipball/77d3ff3e8ddf88546eaf288a399d11f130553606", + "reference": "77d3ff3e8ddf88546eaf288a399d11f130553606", "shasum": "" }, "require": { @@ -26,13 +26,13 @@ "psr/cache": "^1.0 || ^2.0 || ^3.0", "psr/container": "^1.0 || ^2.0", "symfony/deprecation-contracts": "^3.1", - "symfony/http-foundation": "^6.4 || ^7.0", - "symfony/http-kernel": "^6.4 || ^7.0", - "symfony/property-access": "^6.4 || ^7.0", - "symfony/property-info": "^6.4 || ^7.0", - "symfony/serializer": "^6.4 || ^7.0", + "symfony/http-foundation": "^6.4 || ^7.1", + "symfony/http-kernel": "^6.4 || ^7.1", + "symfony/property-access": "^6.4 || ^7.1", + "symfony/property-info": "^6.4 || ^7.1", + "symfony/serializer": "^6.4 || ^7.1", "symfony/translation-contracts": "^3.3", - "symfony/web-link": "^6.4 || ^7.0", + "symfony/web-link": "^6.4 || ^7.1", "willdurand/negotiation": "^3.0" }, "conflict": { @@ -44,15 +44,56 @@ "elasticsearch/elasticsearch": ">=8.0,<8.4", "phpspec/prophecy": "<1.15", "phpunit/phpunit": "<9.5", - "symfony/framework-bundle": "6.4.6 || 7.0.6", + "symfony/framework-bundle": "6.4.6 || 7.1.6", "symfony/var-exporter": "<6.1.1" }, - "require-dev": { + "replace": { + "api-platform/doctrine-common": "self.version", + "api-platform/doctrine-odm": "self.version", + "api-platform/doctrine-orm": "self.version", + "api-platform/documentation": "self.version", + "api-platform/elasticsearch": "self.version", + "api-platform/graphql": "self.version", + "api-platform/http-cache": "self.version", + "api-platform/hydra": "self.version", + "api-platform/json-api": "self.version", + "api-platform/json-hal": "self.version", + "api-platform/json-schema": "self.version", + "api-platform/jsonld": "self.version", + "api-platform/laravel": "self.version", + "api-platform/metadata": "self.version", + "api-platform/openapi": "self.version", + "api-platform/parameter-validator": "self.version", + "api-platform/ramsey-uuid": "self.version", + "api-platform/serializer": "self.version", + "api-platform/state": "self.version", + "api-platform/symfony": "self.version", + "api-platform/validator": "self.version" + }, + "require-dev": { + "api-platform/doctrine-common": "^3.4 || ^4.0", + "api-platform/doctrine-odm": "^3.4 || ^4.0", + "api-platform/doctrine-orm": "^3.4 || ^4.0", + "api-platform/documentation": "^3.4 || ^4.0", + "api-platform/elasticsearch": "^3.4 || ^4.0", + "api-platform/graphql": "^3.4 || ^4.0", + "api-platform/http-cache": "^3.4 || ^4.0", + "api-platform/hydra": "^3.4 || ^4.0", + "api-platform/json-api": "^3.3 || ^4.0", + "api-platform/json-schema": "^3.4 || ^4.0", + "api-platform/jsonld": "^3.4 || ^4.0", + "api-platform/metadata": "^3.4 || ^4.0", + "api-platform/openapi": "^3.4 || ^4.0", + "api-platform/parameter-validator": "^3.4", + "api-platform/ramsey-uuid": "^3.4 || ^4.0", + "api-platform/serializer": "^3.4 || ^4.0", + "api-platform/state": "^3.4 || ^4.0", + "api-platform/validator": "^3.4 || ^4.0", "behat/behat": "^3.11", "behat/mink": "^1.9", "doctrine/cache": "^1.11 || ^2.1", "doctrine/common": "^3.2.2", - "doctrine/dbal": "^3.4.0", + "doctrine/dbal": "^3.4.0 || ^4.0", "doctrine/doctrine-bundle": "^1.12 || ^2.0", "doctrine/mongodb-odm": "^2.2", "doctrine/mongodb-odm-bundle": "^4.0 || ^5.0", @@ -61,7 +102,7 @@ "friends-of-behat/mink-browserkit-driver": "^1.3.1", "friends-of-behat/mink-extension": "^2.2", "friends-of-behat/symfony-extension": "^2.1", - "guzzlehttp/guzzle": "^6.0 || ^7.0", + "guzzlehttp/guzzle": "^6.0 || ^7.1", "jangregor/phpstan-prophecy": "^1.0", "justinrainbow/json-schema": "^5.2.1", "phpspec/prophecy-phpunit": "^2.0", @@ -74,41 +115,42 @@ "phpunit/phpunit": "^9.6", "psr/log": "^1.0 || ^2.0 || ^3.0", "ramsey/uuid": "^3.9.7 || ^4.0", - "ramsey/uuid-doctrine": "^1.4 || ^2.0", + "ramsey/uuid-doctrine": "^1.4 || ^2.0 || ^3.0", "sebastian/comparator": "<5.0", "soyuka/contexts": "v3.3.9", - "soyuka/pmu": "^0.0.2", + "soyuka/pmu": "^0.0.12", "soyuka/stubs-mongodb": "^1.0", - "symfony/asset": "^6.4 || ^7.0", - "symfony/browser-kit": "^6.4 || ^7.0", - "symfony/cache": "^6.4 || ^7.0", - "symfony/config": "^6.4 || ^7.0", - "symfony/console": "^6.4 || ^7.0", - "symfony/css-selector": "^6.4 || ^7.0", - "symfony/dependency-injection": "^6.4 || ^7.0.12", - "symfony/doctrine-bridge": "^6.4 || ^7.0", - "symfony/dom-crawler": "^6.4 || ^7.0", - "symfony/error-handler": "^6.4 || ^7.0", - "symfony/event-dispatcher": "^6.4 || ^7.0", - "symfony/expression-language": "^6.4 || ^7.0", - "symfony/finder": "^6.4 || ^7.0", - "symfony/form": "^6.4 || ^7.0", - "symfony/framework-bundle": "^6.4 || ^7.0", - "symfony/http-client": "^6.4 || ^7.0", - "symfony/intl": "^6.4 || ^7.0", + "symfony/asset": "^6.4 || ^7.1", + "symfony/browser-kit": "^6.4 || ^7.1", + "symfony/cache": "^6.4 || ^7.1", + "symfony/config": "^6.4 || ^7.1", + "symfony/console": "^6.4 || ^7.1", + "symfony/css-selector": "^6.4 || ^7.1", + "symfony/dependency-injection": "^6.4 || ^7.1", + "symfony/doctrine-bridge": "^6.4 || ^7.1", + "symfony/dom-crawler": "^6.4 || ^7.1", + "symfony/error-handler": "^6.4 || ^7.1", + "symfony/event-dispatcher": "^6.4 || ^7.1", + "symfony/expression-language": "^6.4 || ^7.1", + "symfony/finder": "^6.4 || ^7.1", + "symfony/form": "^6.4 || ^7.1", + "symfony/framework-bundle": "^6.4 || ^7.1", + "symfony/http-client": "^6.4 || ^7.1", + "symfony/intl": "^6.4 || ^7.1", "symfony/maker-bundle": "^1.24", "symfony/mercure-bundle": "*", - "symfony/messenger": "^6.4 || ^7.0", - "symfony/phpunit-bridge": "^6.4.1 || ^7.0", - "symfony/routing": "^6.4 || ^7.0", - "symfony/security-bundle": "^6.4 || ^7.0", - "symfony/security-core": "^6.4 || ^7.0", - "symfony/stopwatch": "^6.4 || ^7.0", - "symfony/twig-bundle": "^6.4 || ^7.0", - "symfony/uid": "^6.4 || ^7.0", - "symfony/validator": "^6.4 || ^7.0", - "symfony/web-profiler-bundle": "^6.4 || ^7.0", - "symfony/yaml": "^6.4 || ^7.0", + "symfony/messenger": "^6.4 || ^7.1", + "symfony/phpunit-bridge": "^6.4.1 || ^7.1", + "symfony/routing": "^6.4 || ^7.1", + "symfony/security-bundle": "^6.4 || ^7.1", + "symfony/security-core": "^6.4 || ^7.1", + "symfony/stopwatch": "^6.4 || ^7.1", + "symfony/string": "^6.4 || ^7.1", + "symfony/twig-bundle": "^6.4 || ^7.1", + "symfony/uid": "^6.4 || ^7.1", + "symfony/validator": "^6.4 || ^7.1", + "symfony/web-profiler-bundle": "^6.4 || ^7.1", + "symfony/yaml": "^6.4 || ^7.1", "twig/twig": "^1.42.3 || ^2.12 || ^3.0", "webonyx/graphql-php": "^14.0 || ^15.0" }, @@ -133,31 +175,22 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3.x-dev" + "dev-3.4": "3.4.x-dev", + "dev-main": "4.0.x-dev" }, "symfony": { - "require": "^6.4 || ^7.0" - }, - "projects": [ - "api-platform/doctrine-common", - "api-platform/doctrine-orm", - "api-platform/doctrine-odm", - "api-platform/metadata", - "api-platform/json-schema", - "api-platform/elasticsearch", - "api-platform/jsonld", - "api-platform/hydra", - "api-platform/openapi", - "api-platform/graphql", - "api-platform/http-cache", - "api-platform/documentation", - "api-platform/parameter-validator", - "api-platform/ramsey-uuid", - "api-platform/serializer", - "api-platform/state", - "api-platform/symfony", - "api-platform/validator" - ] + "require": "^6.4 || ^7.1" + }, + "pmu": { + "projects": [ + "./src/*/composer.json", + "src/Doctrine/*/composer.json" + ] + }, + "thanks": { + "name": "api-platform/api-platform", + "url": "https://github.com/api-platform/api-platform" + } }, "autoload": { "psr-4": { @@ -190,9 +223,9 @@ ], "support": { "issues": "https://github.com/api-platform/core/issues", - "source": "https://github.com/api-platform/core/tree/v3.3.13" + "source": "https://github.com/api-platform/core/tree/v3.4.4" }, - "time": "2024-09-15T08:23:39+00:00" + "time": "2024-10-19T10:05:07+00:00" }, { "name": "behat/transliterator", From b0d5ef0610496dba3d9eaefeec715d01a9a1f812 Mon Sep 17 00:00:00 2001 From: Pirmin Mattmann Date: Sat, 19 Oct 2024 21:32:55 +0200 Subject: [PATCH 3/4] fix breaking change api-platform 3.4 --- ...omaticEmbeddingPropertyMetadataFactory.php | 1 + ...est__testOpenApiSpecMatchesSnapshot__1.yml | 406 +++++++++--------- ...icEmbeddingPropertyMetadataFactoryTest.php | 3 + 3 files changed, 207 insertions(+), 203 deletions(-) diff --git a/api/src/Serializer/PreventAutomaticEmbeddingPropertyMetadataFactory.php b/api/src/Serializer/PreventAutomaticEmbeddingPropertyMetadataFactory.php index 99d3a924fc..f436472dd2 100644 --- a/api/src/Serializer/PreventAutomaticEmbeddingPropertyMetadataFactory.php +++ b/api/src/Serializer/PreventAutomaticEmbeddingPropertyMetadataFactory.php @@ -86,6 +86,7 @@ public function create(string $resourceClass, string $property, array $options = $apiProperty->getIris(), $apiProperty->getGenId(), $apiProperty->getUriTemplate(), + $apiProperty->getProperty(), $apiProperty->getExtraProperties() ); } diff --git a/api/tests/Api/SnapshotTests/__snapshots__/ResponseSnapshotTest__testOpenApiSpecMatchesSnapshot__1.yml b/api/tests/Api/SnapshotTests/__snapshots__/ResponseSnapshotTest__testOpenApiSpecMatchesSnapshot__1.yml index 27900e3b79..4e631ef3b8 100644 --- a/api/tests/Api/SnapshotTests/__snapshots__/ResponseSnapshotTest__testOpenApiSpecMatchesSnapshot__1.yml +++ b/api/tests/Api/SnapshotTests/__snapshots__/ResponseSnapshotTest__testOpenApiSpecMatchesSnapshot__1.yml @@ -22782,7 +22782,7 @@ paths: operationId: api_activities_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -22794,7 +22794,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23031,7 +23031,7 @@ paths: operationId: api_activity_progress_labels_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23043,7 +23043,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23280,7 +23280,7 @@ paths: operationId: api_activity_responsibles_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23292,7 +23292,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23304,7 +23304,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23318,7 +23318,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23818,7 +23818,7 @@ paths: operationId: api_camp_collaborations_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23830,7 +23830,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23842,7 +23842,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -23856,7 +23856,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24150,7 +24150,7 @@ paths: operationId: api_camps_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24162,7 +24162,7 @@ paths: type: boolean style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24279,18 +24279,6 @@ paths: allowEmptyValue: false allowReserved: false deprecated: false - description: 'Category identifier' - explode: false - in: path - name: campId - required: true - schema: - type: string - style: simple - - - allowEmptyValue: true - allowReserved: false - deprecated: false description: '' explode: false in: query @@ -24300,7 +24288,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24313,6 +24301,18 @@ paths: type: string type: array style: form + - + allowEmptyValue: false + allowReserved: false + deprecated: false + description: 'Category identifier' + explode: false + in: path + name: campId + required: true + schema: + type: string + style: simple responses: 200: content: @@ -24366,18 +24366,6 @@ paths: allowEmptyValue: false allowReserved: false deprecated: false - description: 'Checklist identifier' - explode: false - in: path - name: campId - required: true - schema: - type: string - style: simple - - - allowEmptyValue: true - allowReserved: false - deprecated: false description: '' explode: false in: query @@ -24387,7 +24375,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24399,7 +24387,7 @@ paths: type: boolean style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24413,7 +24401,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24426,6 +24414,18 @@ paths: type: boolean type: array style: form + - + allowEmptyValue: false + allowReserved: false + deprecated: false + description: 'Checklist identifier' + explode: false + in: path + name: campId + required: true + schema: + type: string + style: simple responses: 200: content: @@ -24599,7 +24599,7 @@ paths: operationId: api_categories_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24611,7 +24611,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24848,7 +24848,7 @@ paths: operationId: api_checklist_items_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24860,7 +24860,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24872,7 +24872,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -24886,7 +24886,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25123,7 +25123,7 @@ paths: operationId: api_checklists_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25135,7 +25135,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25147,7 +25147,7 @@ paths: type: boolean style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25161,7 +25161,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25278,18 +25278,6 @@ paths: allowEmptyValue: false allowReserved: false deprecated: false - description: 'ChecklistItem identifier' - explode: false - in: path - name: checklistId - required: true - schema: - type: string - style: simple - - - allowEmptyValue: true - allowReserved: false - deprecated: false description: '' explode: false in: query @@ -25299,7 +25287,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25311,7 +25299,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25325,7 +25313,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25338,6 +25326,18 @@ paths: type: string type: array style: form + - + allowEmptyValue: false + allowReserved: false + deprecated: false + description: 'ChecklistItem identifier' + explode: false + in: path + name: checklistId + required: true + schema: + type: string + style: simple responses: 200: content: @@ -25511,7 +25511,7 @@ paths: operationId: api_content_nodechecklist_nodes_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25523,7 +25523,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25535,7 +25535,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25547,7 +25547,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25559,7 +25559,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25573,7 +25573,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25810,7 +25810,7 @@ paths: operationId: api_content_nodecolumn_layouts_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25822,7 +25822,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25834,7 +25834,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25846,7 +25846,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25858,7 +25858,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -25872,7 +25872,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26109,7 +26109,7 @@ paths: operationId: api_content_nodematerial_nodes_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26121,7 +26121,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26133,7 +26133,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26145,7 +26145,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26157,7 +26157,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26171,7 +26171,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26408,7 +26408,7 @@ paths: operationId: api_content_nodemulti_selects_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26420,7 +26420,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26432,7 +26432,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26444,7 +26444,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26456,7 +26456,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26470,7 +26470,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26707,7 +26707,7 @@ paths: operationId: api_content_noderesponsive_layouts_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26719,7 +26719,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26731,7 +26731,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26743,7 +26743,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26755,7 +26755,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -26769,7 +26769,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27006,7 +27006,7 @@ paths: operationId: api_content_nodesingle_texts_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27018,7 +27018,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27030,7 +27030,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27042,7 +27042,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27054,7 +27054,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27068,7 +27068,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27305,7 +27305,7 @@ paths: operationId: api_content_nodestoryboards_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27317,7 +27317,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27329,7 +27329,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27341,7 +27341,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27353,7 +27353,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27367,7 +27367,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27604,7 +27604,7 @@ paths: operationId: api_content_nodes_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27616,7 +27616,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27628,7 +27628,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27640,7 +27640,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27652,7 +27652,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27666,7 +27666,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27729,7 +27729,7 @@ paths: operationId: api_content_types_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27741,7 +27741,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27753,7 +27753,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27767,7 +27767,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27872,7 +27872,7 @@ paths: operationId: api_day_responsibles_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27884,7 +27884,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27896,7 +27896,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -27910,7 +27910,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28091,7 +28091,7 @@ paths: operationId: api_days_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28103,7 +28103,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28115,7 +28115,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28129,7 +28129,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28195,18 +28195,6 @@ paths: allowEmptyValue: false allowReserved: false deprecated: false - description: 'DayResponsible identifier' - explode: false - in: path - name: dayId - required: true - schema: - type: string - style: simple - - - allowEmptyValue: true - allowReserved: false - deprecated: false description: '' explode: false in: query @@ -28216,7 +28204,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28228,7 +28216,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28242,7 +28230,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28255,6 +28243,18 @@ paths: type: string type: array style: form + - + allowEmptyValue: false + allowReserved: false + deprecated: false + description: 'DayResponsible identifier' + explode: false + in: path + name: dayId + required: true + schema: + type: string + style: simple responses: 200: content: @@ -28503,7 +28503,7 @@ paths: operationId: api_material_items_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28515,7 +28515,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28527,7 +28527,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28539,7 +28539,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28553,7 +28553,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28790,7 +28790,7 @@ paths: operationId: api_material_lists_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -28802,7 +28802,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29039,7 +29039,7 @@ paths: operationId: api_periods_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29051,7 +29051,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29291,18 +29291,6 @@ paths: allowEmptyValue: false allowReserved: false deprecated: false - description: 'Day identifier' - explode: false - in: path - name: periodId - required: true - schema: - type: string - style: simple - - - allowEmptyValue: true - allowReserved: false - deprecated: false description: '' explode: false in: query @@ -29312,7 +29300,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29324,7 +29312,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29338,7 +29326,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29351,6 +29339,18 @@ paths: type: string type: array style: form + - + allowEmptyValue: false + allowReserved: false + deprecated: false + description: 'Day identifier' + explode: false + in: path + name: periodId + required: true + schema: + type: string + style: simple responses: 200: content: @@ -29404,18 +29404,6 @@ paths: allowEmptyValue: false allowReserved: false deprecated: false - description: 'ScheduleEntry identifier' - explode: false - in: path - name: periodId - required: true - schema: - type: string - style: simple - - - allowEmptyValue: true - allowReserved: false - deprecated: false description: '' explode: false in: query @@ -29425,7 +29413,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29437,7 +29425,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29449,7 +29437,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29461,7 +29449,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29473,7 +29461,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29485,7 +29473,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29497,7 +29485,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29509,7 +29497,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29521,7 +29509,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29533,7 +29521,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29547,7 +29535,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29560,6 +29548,18 @@ paths: type: string type: array style: form + - + allowEmptyValue: false + allowReserved: false + deprecated: false + description: 'ScheduleEntry identifier' + explode: false + in: path + name: periodId + required: true + schema: + type: string + style: simple responses: 200: content: @@ -29815,7 +29815,7 @@ paths: operationId: api_profiles_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29827,7 +29827,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -29988,7 +29988,7 @@ paths: operationId: api_schedule_entries_get_collection parameters: - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30000,7 +30000,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30012,7 +30012,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30024,7 +30024,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30036,7 +30036,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30048,7 +30048,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30060,7 +30060,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30072,7 +30072,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30084,7 +30084,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30096,7 +30096,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30108,7 +30108,7 @@ paths: type: string style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' @@ -30122,7 +30122,7 @@ paths: type: array style: form - - allowEmptyValue: true + allowEmptyValue: false allowReserved: false deprecated: false description: '' diff --git a/api/tests/Serializer/PreventAutomaticEmbeddingPropertyMetadataFactoryTest.php b/api/tests/Serializer/PreventAutomaticEmbeddingPropertyMetadataFactoryTest.php index 52cadf1b4d..9e1edee490 100644 --- a/api/tests/Serializer/PreventAutomaticEmbeddingPropertyMetadataFactoryTest.php +++ b/api/tests/Serializer/PreventAutomaticEmbeddingPropertyMetadataFactoryTest.php @@ -41,6 +41,7 @@ public function testCreateResetsReadableLinkAndWritableLinkToNull() { ['iris'], true, 'uriTemplate', + 'property', ['extraProperties'] ); $decorated->expects($this->once()) @@ -80,6 +81,8 @@ public function testCreateResetsReadableLinkAndWritableLinkToNull() { $this->assertEquals($apiProperty->isInitializable(), $result->isInitializable()); $this->assertEquals($apiProperty->getIris(), $result->getIris()); $this->assertEquals($apiProperty->getGenId(), $result->getGenId()); + $this->assertEquals($apiProperty->getUriTemplate(), $result->getUriTemplate()); + $this->assertEquals($apiProperty->getProperty(), $result->getProperty()); $this->assertEquals($apiProperty->getExtraProperties(), $result->getExtraProperties()); } } From 79571ca234d866b1bf50b9c638337590e2158c1d Mon Sep 17 00:00:00 2001 From: Pirmin Mattmann Date: Mon, 21 Oct 2024 22:53:05 +0200 Subject: [PATCH 4/4] set exception_to_status --- api/config/packages/api_platform.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/api/config/packages/api_platform.yaml b/api/config/packages/api_platform.yaml index e6a16a6af6..28980e4b83 100644 --- a/api/config/packages/api_platform.yaml +++ b/api/config/packages/api_platform.yaml @@ -42,3 +42,14 @@ api_platform: order: createTime: DESC keep_legacy_inflector: false + + # On API-Platform Update - test, if this config is still needed. + # See PR 5948: https://github.com/ecamp/ecamp3/pull/5948 + exception_to_status: + # Default + Symfony\Component\Serializer\Exception\ExceptionInterface: 400 + ApiPlatform\Metadata\Exception\InvalidArgumentException: 400 + ApiPlatform\ParameterValidator\Exception\ValidationExceptionInterface: 400 + Doctrine\ORM\OptimisticLockException: 409 + # Legacy + ApiPlatform\Exception\InvalidArgumentException: 400 \ No newline at end of file