Merge branch '5.4' into 6.0

derrabus · derrabus · commit f821d768bfc9 · 2021-07-14T19:08:31.000+02:00
* 5.4:
  Remove duplicated array entry
  qa: add missing type-hints to workflow `Transition`
  Declare returned type.
diff --git a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
@@ -43,7 +43,7 @@ interface EventSubscriberInterface
      * The code must not depend on runtime state as it will only be called at compile time.
      * All logic depending on runtime state must be put into the individual methods handling the events.
      *
-     * @return array The event names to listen to
+     * @return array<string, mixed> The event names to listen to
      */
     public static function getSubscribedEvents();
 }
diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
@@ -523,7 +523,6 @@ public function testSingleTextWidgetWithSecondsShouldNotOverrideStepAttribute()
     public function testSingleTextWidgetWithCustomNonHtml5Format()
     {
         $form = $this->factory->create(static::TESTED_TYPE, new \DateTime('2019-02-13 19:12:13'), [
-            'html5' => false,
             'widget' => 'single_text',
             'date_format' => \IntlDateFormatter::SHORT,
             'format' => null,
diff --git a/src/Symfony/Component/Workflow/Transition.php b/src/Symfony/Component/Workflow/Transition.php
@@ -32,16 +32,25 @@ public function __construct(string $name, string|array $froms, string|array $tos
         $this->tos = (array) $tos;
     }
 
+    /**
+     * @return string
+     */
     public function getName()
     {
         return $this->name;
     }
 
+    /**
+     * @return string[]
+     */
     public function getFroms()
     {
         return $this->froms;
     }
 
+    /**
+     * @return string[]
+     */
     public function getTos()
     {
         return $this->tos;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ interface EventSubscriberInterface`
`43`	`43`	`* The code must not depend on runtime state as it will only be called at compile time.`
`44`	`44`	`* All logic depending on runtime state must be put into the individual methods handling the events.`
`45`	`45`	`*`
`46`		`- * @return array The event names to listen to`
	`46`	`+ * @return array<string, mixed> The event names to listen to`
`47`	`47`	`*/`
`48`	`48`	`public static function getSubscribedEvents();`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,6 @@ public function testSingleTextWidgetWithSecondsShouldNotOverrideStepAttribute()`
`523`	`523`	`public function testSingleTextWidgetWithCustomNonHtml5Format()`
`524`	`524`	`{`
`525`	`525`	`$form = $this->factory->create(static::TESTED_TYPE, new \DateTime('2019-02-13 19:12:13'), [`
`526`		`- 'html5' => false,`
`527`	`526`	`'widget' => 'single_text',`
`528`	`527`	`'date_format' => \IntlDateFormatter::SHORT,`
`529`	`528`	`'format' => null,`
Original file line number	Diff line number	Diff line change
`@@ -32,16 +32,25 @@ public function __construct(string $name, string\|array $froms, string\|array $tos`
`32`	`32`	`$this->tos = (array) $tos;`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ /**`
	`36`	`+ * @return string`
	`37`	`+ */`
`35`	`38`	`public function getName()`
`36`	`39`	`{`
`37`	`40`	`return $this->name;`
`38`	`41`	`}`
`39`	`42`
	`43`	`+ /**`
	`44`	`+ * @return string[]`
	`45`	`+ */`
`40`	`46`	`public function getFroms()`
`41`	`47`	`{`
`42`	`48`	`return $this->froms;`
`43`	`49`	`}`
`44`	`50`
	`51`	`+ /**`
	`52`	`+ * @return string[]`
	`53`	`+ */`
`45`	`54`	`public function getTos()`
`46`	`55`	`{`
`47`	`56`	`return $this->tos;`