Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit f9b2156c881d · 2018-08-24T12:22:26.000+02:00
* 3.4:
  [DoctrineBridge] support __toString as documented for UniqueEntityValidator
  [travis] enable Redis cluster
  [Cache] enable Memcached::OPT_TCP_NODELAY to fix perf of misses
  fix data mapper return type in docblock
  fix type error handling when writing values
diff --git a/FormConfigInterface.php b/FormConfigInterface.php
@@ -99,7 +99,7 @@ public function getModelTransformers();
     /**
      * Returns the data mapper of the form.
      *
-     * @return DataMapperInterface The data mapper
+     * @return DataMapperInterface|null The data mapper
      */
     public function getDataMapper();
 

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ public function getModelTransformers();`
`99`	`99`	`/**`
`100`	`100`	`* Returns the data mapper of the form.`
`101`	`101`	`*`
`102`		`- * @return DataMapperInterface The data mapper`
	`102`	`+ * @return DataMapperInterface\|null The data mapper`
`103`	`103`	`*/`
`104`	`104`	`public function getDataMapper();`
`105`	`105`