Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit de2ff10

Browse filesBrowse files
committed
bug #43206 [Workflow] Add missing audit-trail settings in framework workflow con… (Stephan Wentz)
This PR was submitted for the 5.4 branch but it was merged into the 5.3 branch instead. Discussion ---------- [Workflow] Add missing audit-trail settings in framework workflow con… audit-trail config was missing in xsd. Example from symfony.com did not work as expected due to this. | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #43194 | License | MIT | Doc PR | N/A Commit adds audit-trail in xsd Commits ------- 6d2b71e [Workflow] Add missing audit-trail settings in framework workflow config xsd
2 parents 9c2a9c8 + 6d2b71e commit de2ff10
Copy full SHA for de2ff10

File tree

2 files changed

+16
-0
lines changed
Filter options

2 files changed

+16
-0
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd
+14Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@
310310

311311
<xsd:complexType name="workflow">
312312
<xsd:sequence>
313+
<xsd:element name="audit-trail" type="audit_trail" minOccurs="0" maxOccurs="1" />
313314
<xsd:element name="initial-marking" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
314315
<xsd:element name="marking-store" type="marking_store" minOccurs="0" maxOccurs="1" />
315316
<xsd:element name="support" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
@@ -339,6 +340,19 @@
339340
<xsd:attribute name="logLevel" type="xsd:string" />
340341
</xsd:complexType>
341342

343+
<xsd:complexType name="audit_trail">
344+
<xsd:attribute name="enabled" type="xsd:boolean" />
345+
</xsd:complexType>
346+
347+
<xsd:simpleType name="audit_trail_enabled">
348+
<xsd:restriction base="xsd:string">
349+
<xsd:enumeration value="true" />
350+
<xsd:enumeration value="false" />
351+
<xsd:enumeration value="1" />
352+
<xsd:enumeration value="0" />
353+
</xsd:restriction>
354+
</xsd:simpleType>
355+
342356
<xsd:complexType name="marking_store">
343357
<xsd:sequence>
344358
<xsd:element name="argument" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/workflows.xml
+2Lines 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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.