Merge remote-tracking branch 'origin/5.4' into 6.2

* origin/5.4:
  [Workflow] Cleaning code

Author: lyrixx

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

@@ -402,8 +402,6 @@
 
     <xsd:simpleType name="marking_store_type">
         <xsd:restriction base="xsd:string">
-            <xsd:enumeration value="multiple_state" />
-            <xsd:enumeration value="single_state" />
             <xsd:enumeration value="method" />
         </xsd:restriction>
     </xsd:simpleType>

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

@@ -10,7 +10,6 @@
         <framework:workflow name="article" type="workflow">
             <framework:audit-trail enabled="true"/>
             <framework:initial-marking>draft</framework:initial-marking>
-            <framework:marking-store type="method" property="state" />
             <framework:support>Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\FrameworkExtensionTestCase</framework:support>
             <framework:place name="draft" />
             <framework:place name="wait_for_journalist" />

src/Symfony/Component/Workflow/Tests/MarkingStore/MethodMarkingStoreTest.php

@@ -12,7 +12,6 @@
 namespace Symfony\Component\Workflow\Tests\MarkingStore;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\MarkingStore\MethodMarkingStore;
 use Symfony\Component\Workflow\Tests\Subject;
 
@@ -26,7 +25,6 @@ public function testGetSetMarkingWithMultipleState()
 
         $marking = $markingStore->getMarking($subject);
 
-        $this->assertInstanceOf(Marking::class, $marking);
         $this->assertCount(0, $marking->getPlaces());
 
         $marking->mark('first_place');
@@ -48,7 +46,6 @@ public function testGetSetMarkingWithSingleState()
 
         $marking = $markingStore->getMarking($subject);
 
-        $this->assertInstanceOf(Marking::class, $marking);
         $this->assertCount(0, $marking->getPlaces());
 
         $marking->mark('first_place');
@@ -70,7 +67,6 @@ public function testGetSetMarkingWithSingleStateAndAlmostEmptyPlaceName()
 
         $marking = $markingStore->getMarking($subject);
 
-        $this->assertInstanceOf(Marking::class, $marking);
         $this->assertCount(1, $marking->getPlaces());
     }
 
@@ -82,7 +78,6 @@ public function testGetMarkingWithValueObject()
 
         $marking = $markingStore->getMarking($subject);
 
-        $this->assertInstanceOf(Marking::class, $marking);
         $this->assertCount(1, $marking->getPlaces());
         $this->assertSame('first_place', (string) $subject->getMarking());
     }
@@ -95,7 +90,6 @@ public function testGetMarkingWithUninitializedProperty()
 
         $marking = $markingStore->getMarking($subject);
 
-        $this->assertInstanceOf(Marking::class, $marking);
         $this->assertCount(0, $marking->getPlaces());
     }