Skip to content

Commit 7af4d9e

Browse files
Merge branch '3.4' into 4.1
* 3.4: [php_cs] disable fopen_flags [DI] fix error in dumped container [CS] Remove unused variables passed to closures [DI] fix dumping setters before their inlined instances [CS] Remove empty comment [CS] Enforces null type hint on last position in phpDocs [CS] Use combined assignment operators when possible Fix a typo in error messages Don't return early as this bypasses the auto exit feature [Console] Add missing null to input values allowed types [PHPUnitBridge] Fix microtime() format bumped Symfony version to 3.4.17 updated VERSION for 3.4.16 updated CHANGELOG for 3.4.16 bumped Symfony version to 2.8.47 update CONTRIBUTORS for 2.8.46 updated VERSION for 2.8.46 updated CHANGELOG for 2.8.46
2 parents 4a8426a + 8a852d5 commit 7af4d9e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Extension/WorkflowExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function getMarkedPlaces($subject, $placesNameOnly = true, $name = null)
106106
* Returns the metadata for a specific subject.
107107
*
108108
* @param object $subject A subject
109-
* @param null|string|Transition $metadataSubject Use null to get workflow metadata
109+
* @param string|Transition|null $metadataSubject Use null to get workflow metadata
110110
* Use a string (the place name) to get place metadata
111111
* Use a Transition instance to get transition metadata
112112
*/

0 commit comments

Comments
 (0)