Skip to content

Commit 0a42ed6

Browse files
committed
Merge remote-tracking branch 'origin/6.2' into 6.3
* origin/6.2: [Workflow] Cleaning code
2 parents d3eda67 + 1dca70a commit 0a42ed6

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

Resources/config/schema/symfony-1.0.xsd

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

448448
<xsd:simpleType name="marking_store_type">
449449
<xsd:restriction base="xsd:string">
450-
<xsd:enumeration value="multiple_state" />
451-
<xsd:enumeration value="single_state" />
452450
<xsd:enumeration value="method" />
453451
</xsd:restriction>
454452
</xsd:simpleType>

Tests/DependencyInjection/Fixtures/xml/workflows.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<framework:workflow name="article" type="workflow">
1111
<framework:audit-trail enabled="true"/>
1212
<framework:initial-marking>draft</framework:initial-marking>
13-
<framework:marking-store type="method" property="state" />
1413
<framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
1514
<framework:place name="draft" />
1615
<framework:place name="wait_for_journalist" />

0 commit comments

Comments
 (0)