Skip to content

Commit e94d49a

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: [Serializer] Fix denormalizing of array with empty body [Security] Remove annoying deprecation in `UsageTrackingTokenStorage` Bump Symfony version to 5.3.10 Update VERSION for 5.3.9 Fix CHANGELOG Update CHANGELOG for 5.3.9 Bump Symfony version to 4.4.33 Update VERSION for 4.4.32 Fix CHANGELOG Update CHANGELOG for 4.4.32 [Workflow] Remove dead code in XML schemas Bump Symfony version to 5.3.9 Update VERSION for 5.3.8 Update CHANGELOG for 5.3.8 Bump Symfony version to 4.4.32 Update VERSION for 4.4.31 Update CONTRIBUTORS for 4.4.31 Update CHANGELOG for 4.4.31 [Workflow] Add missing audit-trail settings in framework workflow config xsd [Serializer] Fix denormalizing of array with empty body
2 parents 571457a + 895226d commit e94d49a

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

Resources/config/schema/symfony-1.0.xsd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@
312312

313313
<xsd:complexType name="workflow">
314314
<xsd:sequence>
315+
<xsd:element name="audit-trail" type="audit_trail" minOccurs="0" maxOccurs="1" />
315316
<xsd:element name="initial-marking" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
316317
<xsd:element name="marking-store" type="marking_store" minOccurs="0" maxOccurs="1" />
317318
<xsd:element name="support" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
@@ -341,6 +342,10 @@
341342
<xsd:attribute name="logLevel" type="xsd:string" />
342343
</xsd:complexType>
343344

345+
<xsd:complexType name="audit_trail">
346+
<xsd:attribute name="enabled" type="xsd:boolean" />
347+
</xsd:complexType>
348+
344349
<xsd:complexType name="marking_store">
345350
<xsd:sequence>
346351
<xsd:element name="argument" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />

Tests/DependencyInjection/Fixtures/xml/workflows.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<framework:config>
1010
<framework:workflow name="article" type="workflow">
11+
<framework:audit-trail enabled="true"/>
1112
<framework:initial-marking>draft</framework:initial-marking>
1213
<framework:marking-store type="method" property="state" />
1314
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
@@ -42,6 +43,7 @@
4243
</framework:workflow>
4344

4445
<framework:workflow name="pull_request">
46+
<framework:audit-trail enabled="false"/>
4547
<framework:initial-marking>start</framework:initial-marking>
4648
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTest</framework:support>
4749
<framework:place name="start">

0 commit comments

Comments
 (0)