Merge branch '3.4' into 4.2

fabpot · fabpot · commit 0e4df291edbe · 2019-04-06T15:51:08.000+02:00
* 3.4:
  [Form] various minor fixes
  bugfix: the terminal state was wrong and not reseted
  [Console] Fix inconsistent result for choice questions in non-interactive mode
  Define null return type for Constraint::getDefaultOption()
  [HttpKernel] Fix DebugHandlersListener constructor docblock
  Skip Glob brace test when GLOB_BRACE is unavailable
  bumped Symfony version to 3.4.25
  updated VERSION for 3.4.24
  update CONTRIBUTORS for 3.4.24
  updated CHANGELOG for 3.4.24
  [EventDispatcher] cleanup
diff --git a/Constraint.php b/Constraint.php
@@ -232,12 +232,13 @@ public function addImplicitGroupName($group)
      *
      * Override this method to define a default option.
      *
-     * @return string
+     * @return string|null
      *
      * @see __construct()
      */
     public function getDefaultOption()
     {
+        return null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -232,12 +232,13 @@ public function addImplicitGroupName($group)`
`232`	`232`	`*`
`233`	`233`	`* Override this method to define a default option.`
`234`	`234`	`*`
`235`		`- * @return string`
	`235`	`+ * @return string\|null`
`236`	`236`	`*`
`237`	`237`	`* @see __construct()`
`238`	`238`	`*/`
`239`	`239`	`public function getDefaultOption()`
`240`	`240`	`{`
	`241`	`+ return null;`
`241`	`242`	`}`
`242`	`243`
`243`	`244`	`/**`