Commit983e903

committed

[Workflow] Catch error when trying to get an uninitialized marking

1 parent2607b66 commit983e903Copy full SHA for 983e903

File tree

+41

-1

lines changed

+41

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,14 @@ public function getMarking($subject): Marking`
`54`	`54`	`thrownewLogicException(sprintf('The method "%s::%s()" does not exist.',\get_class($subject),$method));`
`55`	`55`	`}`
`56`	`56`
`57`		`-$marking =$subject->{$method}();`
	`57`	`+$marking =null;`
	`58`	`+try {`
	`59`	`+$marking =$subject->{$method}();`
	`60`	`+ }catch (\Error$e) {`
	`61`	`+if (!preg_match('/^Typed property ([\w\\\\@]+)::\$(\w+) must not be accessed before initialization$/',$e->getMessage())) {`
	`62`	`+throw$e;`
	`63`	`+ }`
	`64`	`+ }`
`58`	`65`
`59`	`66`	`if (null ===$marking) {`
`60`	`67`	`returnnewMarking();`

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,21 @@ public function testGetMarkingWithValueObject()`
`78`	`78`	`$this->assertSame('first_place', (string)$subject->getMarking());`
`79`	`79`	`}`
`80`	`80`
	`81`	`+/**`
	`82`	`+ * @requires PHP 7.4`
	`83`	`+ */`
	`84`	`+publicfunctiontestGetMarkingWithUninitializedProperty()`
	`85`	`+ {`
	`86`	`+$subject =newSubjectWithType();`
	`87`	`+`
	`88`	`+$markingStore =newMethodMarkingStore(true);`
	`89`	`+`
	`90`	`+$marking =$markingStore->getMarking($subject);`
	`91`	`+`
	`92`	`+$this->assertInstanceOf(Marking::class,$marking);`
	`93`	`+$this->assertCount(0,$marking->getPlaces());`
	`94`	`+ }`
	`95`	`+`
`81`	`96`	`privatefunctioncreateValueObject(string$markingValue)`
`82`	`97`	`{`
`83`	`98`	`returnnewclass($markingValue) {`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,18 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+namespaceSymfony\Component\Workflow\Tests\MarkingStore;`
	`4`	`+`
	`5`	`+class SubjectWithType`
	`6`	`+{`
	`7`	`+privatestring$marking;`
	`8`	`+`
	`9`	`+publicfunctiongetMarking():string`
	`10`	`+ {`
	`11`	`+return$this->marking;`
	`12`	`+ }`
	`13`	`+`
	`14`	`+publicfunctionsetMarking(string$type):void`
	`15`	`+ {`
	`16`	`+$this->marking =$type;`
	`17`	`+ }`
	`18`	`+}`

Comments

(0)