Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 7e6eeeb3f13b · 2019-08-13T08:39:03.000+02:00
* 3.4:
  Fix return statements
  [TwigBridge] add missing dep
  Add false type to ChoiceListFactoryInterface::createView $label argument
diff --git a/Constraints/Regex.php b/Constraints/Regex.php
@@ -82,7 +82,7 @@ public function getHtmlPattern()
 
         // Quit if delimiters not at very beginning/end (e.g. when options are passed)
         if ($this->pattern[0] !== $this->pattern[\strlen($this->pattern) - 1]) {
-            return;
+            return null;
         }
 
         $delimiter = $this->pattern[0];

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function getHtmlPattern()`
`82`	`82`
`83`	`83`	`// Quit if delimiters not at very beginning/end (e.g. when options are passed)`
`84`	`84`	`if ($this->pattern[0] !== $this->pattern[\strlen($this->pattern) - 1]) {`
`85`		`- return;`
	`85`	`+ return null;`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`$delimiter = $this->pattern[0];`