Merge branch '5.4' into 6.0

nicolas-grekas · nicolas-grekas · commit 0edf47561fb2 · 2021-06-30T16:18:39.000+02:00
* 5.4:
  Fix tests
  CS fix
  CS fix
  CS fix
  CS fixes
  Bump Symfony version to 5.3.4
  Update VERSION for 5.3.3
  Update CHANGELOG for 5.3.3
  Bump Symfony version to 5.2.12
  Update VERSION for 5.2.11
  Update CHANGELOG for 5.2.11
  Bump Symfony version to 4.4.27
  Update VERSION for 4.4.26
  Update CONTRIBUTORS for 4.4.26
  Update CHANGELOG for 4.4.26
diff --git a/AppVariable.php b/AppVariable.php
@@ -152,7 +152,7 @@ public function getDebug()
      *
      * @return array
      */
-    public function getFlashes(string|array|null $types = null)
+    public function getFlashes(string|array $types = null)
     {
         try {
             if (null === $session = $this->getSession()) {
diff --git a/Extension/WorkflowExtension.php b/Extension/WorkflowExtension.php
@@ -102,7 +102,7 @@ public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, st
      *                                                Use a string (the place name) to get place metadata
      *                                                Use a Transition instance to get transition metadata
      */
-    public function getMetadata(object $subject, string $key, string|Transition|null $metadataSubject = null, string $name = null)
+    public function getMetadata(object $subject, string $key, string|Transition $metadataSubject = null, string $name = null)
     {
         return $this
             ->workflowRegistry

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ public function getDebug()`
`152`	`152`	`*`
`153`	`153`	`* @return array`
`154`	`154`	`*/`
`155`		`- public function getFlashes(string\|array\|null $types = null)`
	`155`	`+ public function getFlashes(string\|array $types = null)`
`156`	`156`	`{`
`157`	`157`	`try {`
`158`	`158`	`if (null === $session = $this->getSession()) {`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ public function getMarkedPlaces(object $subject, bool $placesNameOnly = true, st`
`102`	`102`	`* Use a string (the place name) to get place metadata`
`103`	`103`	`* Use a Transition instance to get transition metadata`
`104`	`104`	`*/`
`105`		`- public function getMetadata(object $subject, string $key, string\|Transition\|null $metadataSubject = null, string $name = null)`
	`105`	`+ public function getMetadata(object $subject, string $key, string\|Transition $metadataSubject = null, string $name = null)`
`106`	`106`	`{`
`107`	`107`	`return $this`
`108`	`108`	`->workflowRegistry`