10000 minor #30101 [FrameworkBundle] update xsd to match the 4.2 configurat… · symfony/symfony@696f821 · GitHub
[go: up one dir, main page]
Skip to content

Commit 696f821

Browse files
nicolas-grekasnicolas-grekas
committed
minor #30101 [FrameworkBundle] update xsd to match the 4.2 configuration (XuruDragon)
This PR was merged into the 4.2 branch. Discussion ---------- [FrameworkBundle] update xsd to match the 4.2 configuration | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/A Update the FrameworkBundle xsd to match the 4.2 configuration Commits ------- 7782e60 [FrameworkBundle] update xsd to match the 4.2 configuration
2 parents 32e1400 + 7782e60 commit 696f821

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
</xsd:choice>
3636

3737
<xsd:attribute name="http-method-override" type="xsd:boolean" />
38-
<xsd:attribute name="trusted-proxies" type="xsd:string" />
3938
<xsd:attribute name="ide" type="xsd:string" />
4039
<xsd:attribute name="secret" type="xsd:string" />
4140
<xsd:attribute name="default-locale" type="xsd:string" />
@@ -76,10 +75,6 @@
7675
</xsd:complexType>
7776

7877
<xsd:complexType name="profiler">
79-
<xsd:all>
80-
<xsd:element name="matcher" type="profiler_matcher" minOccurs="0" maxOccurs="1" />
81-
</xsd:all>
82-
8378
<xsd:attribute name="collect" type="xsd:string" />
8479
<xsd:attribute name="only-exceptions" type="xsd:string" />
8580
<xsd:attribute name="only-master-requests" type="xsd:string" />
@@ -90,18 +85,13 @@
9085
<xsd:attribute name="lifetime" type="xsd:string" />
9186
</xsd:complexType>
9287

93-
<xsd:complexType name="profiler_matcher">
94-
<xsd:attribute name="ip" type="xsd:string" />
95-
<xsd:attribute name="path" type="xsd:string" />
96-
<xsd:attribute name="service" type="xsd:string" />
97-
</xsd:complexType>
98-
9988
<xsd:complexType name="router">
10089
<xsd:attribute name="resource" type="xsd:string" />
10190
<xsd:attribute name="type" type="xsd:string" />
10291
<xsd:attribute name="http-port" type="xsd:string" />
10392
<xsd:attribute name="https-port" type="xsd:string" />
10493
<xsd:attribute name="strict-requirements" type="xsd:string" />
94+
<xsd:attribute name="utf8" type="xsd:boolean" />
10595
</xsd:complexType>
10696

10797
<xsd:complexType name="session">
@@ -114,12 +104,12 @@
114104
<xsd:attribute name="cookie-domain" type="xsd:string" />
115105
<xsd:attribute name="cookie-secure" type="cookie_secure" />
116106
<xsd:attribute name="cookie-httponly" type="xsd:boolean" />
107+
<xsd:attribute name="cookie-samesite" type="cookie_samesite" />
117108
<xsd:attribute name="use-cookies" type="xsd:boolean" />
118109
<xsd:attribute name="cache-limiter" type="xsd:string" />
119110
<xsd:attribute name="gc-maxlifetime" type="xsd:string" />
120111
<xsd:attribute name="gc-divisor" type="xsd:string" />
121112
<xsd:attribute name="gc-probability" type="xsd:string" />
122-
<xsd:attribute name="use-strict-mode" type="xsd:boolean" />
123113
<xsd:attribute name="save-path" type="xsd:string" />
124114
<xsd:attribute name="metadata-update-threshold" type="xsd:nonNegativeInteger" />
125115
</xsd:complexType>
@@ -239,7 +229,6 @@
239229
<xsd:element name="mapping" type="file_mapping" />
240230
</xsd:choice>
241231
<xsd:attribute name="enabled" type="xsd:boolean" />
242-
<xsd:attribute name="cache" type="xsd:string" />
243232
<xsd:attribute name="enable-annotations" type="xsd:boolean" />
244233
<xsd:attribute name="name-converter" type="xsd:string" />
245234
<xsd:attribute name="circular-reference-handler" type="xsd:string" />
@@ -259,6 +248,7 @@
259248
<xsd:element name="default-psr6-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
260249
<xsd:element name="default-redis-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
261250
<xsd:element name="default-memcached-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
251+
<xsd:element name="default-pdo-provider" type=< D7AE span class="pl-s">"xsd:string" minOccurs="0" maxOccurs="1" />
262252
<xsd:element name="pool" type="cache_pool" minOccurs="0" maxOccurs="unbounded" />
263253
</xsd:sequence>
264254

@@ -316,6 +306,7 @@
316306
<xsd:element name="to" type="xsd:string" minOccurs="1" maxOccurs="unbounded" />
317307
<xsd:element name="metadata" type="metadata" minOccurs="0" maxOccurs="unbounded" />
318308
<xsd:element name="guard" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
309+
<xsd:element name="metadata" type="metadata" minOccurs="0" maxOccurs="unbounded" />
319310
</xsd:sequence>
320311
<xsd:attribute name="name" type="xsd:string" use="required" />
321312
</xsd:complexType>
@@ -353,6 +344,14 @@
353344
</xsd:restriction>
354345
</xsd:simpleType>
355346

347+
<xsd:simpleType name="cookie_samesite">
348+
<xsd:restriction base="xsd:string">
349+
<xsd:enumeration value="" />
350+
<xsd:enumeration value="lax" />
351+
<xsd:enumeration value="strict" />
352+
</xsd:restriction>
353+
</xsd:simpleType>
354+
356355
<xsd:simpleType name="workflow_type">
357356
<xsd:restriction base="xsd:string">
358357
<xsd:enumeration value="state_machine" />

0 commit comments

Comments
 (0)
0