Skip to content

Commit d117b0f

Browse files
Merge branch '7.4' into 8.0
* 7.4: [Security] Set OIDC JWKS cache TTL from provider headers [DependencyInjection] Call default index method when index is not provided by tag [Console] Remove a redundant local variable in the console Application class. [Cache] Recognize commit events as writes in `CacheDataCollector` [Routing] Align routing.schema.json with YamlFileLoader behavior Bump Symfony version to 7.4.0 Update VERSION for 7.4.0-RC1 Update CHANGELOG for 7.4.0-RC1
2 parents 155f0a5 + 127a199 commit d117b0f

File tree

1 file changed

+28
-3
lines changed

1 file changed

+28
-3
lines changed

Loader/schema/routing.schema.json

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,23 +62,48 @@
6262
"locale": { "type": "string" },
6363
"format": { "type": "string" },
6464
"utf8": { "type": "boolean" },
65-
"stateless": { "type": "boolean" }
65+
"stateless": { "type": "boolean" },
66+
"deprecated": {
67+
"type": "object",
68+
"properties": {
69+
"package": { "type": "string" },
70+
"version": { "type": "string" },
71+
"message": { "type": "string" }
72+
},
73+
"required": ["package", "version"],
74+
"additionalProperties": false
75+
}
6676
},
6777
"required": ["path"],
6878
"additionalProperties": false
6979
},
7080
"routeImport": {
7181
"type": "object",
7282
"properties": {
73-
"resource": { "type": "string", "description": "Path to the resource to import." },
83+
"resource": {
84+
"description": "Path to the resource to import (commonly a string or {path, namespace}), array of paths, or custom value for loaders (additional properties allowed for extensions).",
85+
"oneOf": [
86+
{ "type": "string" },
87+
{ "type": "array", "items": { "type": "string" } },
88+
{
89+
"type": "object",
90+
"properties": {
91+
"path": { "type": "string", "description": "The directory path to the resource." },
92+
"namespace": { "type": "string", "description": "The namespace of the controllers in the imported resource (e.g., 'App\\Availability\\UserInterface\\Api')." }
93+
},
94+
"required": ["path"],
95+
"additionalProperties": true
96+
}
97+
]
98+
},
7499
"type": {
75100
"type": "string",
76101
"description": "The type of the resource (e.g., 'attribute', 'annotation', 'yaml')."
77102
},
78103
"prefix": {
79104
"oneOf": [
80105
{ "type": "string" },
81-
{ "type": "object", "patternProperties": { "^.+$": { "type": "string" } } }
106+
{ "type": "object", "patternProperties": { "^.+$": { "type": "string" } }, "additionalProperties": false }
82107
],
83108
"description": "A URL prefix to apply to all routes from the imported resource."
84109
},

0 commit comments

Comments
 (0)