Merge branch '3.1' into 3.2

nicolas-grekas · nicolas-grekas · commit 02a3718918d1 · 2017-01-02T15:57:35.000+01:00
* 3.1: do not depend on a fixed date in layout tests [Console] Escape default value when dumping help [Console] OS X Can't call cli_set_process_title php without superuser Fixed @return when returning this or static #bis fixed @return when returning this or static Polish translation improvement in Validator component [Console] Descriptors should use Helper::strlen [Config] Improve PHPdoc / IDE autocomplete [Debug] Wrap call to ->log in a try catch block [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes fix merge [cache] Bump RedisAdapter timeout to 5s fixed @return when returning this or static [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService remove is_writable check on filesystem cache
diff --git a/Definition.php b/Definition.php
@@ -437,7 +437,7 @@ public function getFile()
      *
      * @param bool $shared Whether the service must be shared or not
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setShared($shared)
     {
@@ -563,7 +563,7 @@ public function isAbstract()
      * @param bool   $status
      * @param string $template Template message to use if the definition is deprecated
      *
-     * @return Definition the current instance
+     * @return $this
      *
      * @throws InvalidArgumentException When the message template is invalid.
      */
@@ -642,7 +642,7 @@ public function getConfigurator()
      *
      * @param string[] $types
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setAutowiringTypes(array $types)
     {
@@ -670,7 +670,7 @@ public function isAutowired()
      *
      * @param bool $autowired
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function setAutowired($autowired)
     {
@@ -694,7 +694,7 @@ public function getAutowiringTypes()
      *
      * @param string $type
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function addAutowiringType($type)
     {
@@ -708,7 +708,7 @@ public function addAutowiringType($type)
      *
      * @param string $type
      *
-     * @return Definition The current instance
+     * @return $this
      */
     public function removeAutowiringType($type)
     {

Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ public function getFile()`
`437`	`437`	`*`
`438`	`438`	`* @param bool $shared Whether the service must be shared or not`
`439`	`439`	`*`
`440`		`- * @return Definition The current instance`
	`440`	`+ * @return $this`
`441`	`441`	`*/`
`442`	`442`	`public function setShared($shared)`
`443`	`443`	`{`
`@@ -563,7 +563,7 @@ public function isAbstract()`
`563`	`563`	`* @param bool $status`
`564`	`564`	`* @param string $template Template message to use if the definition is deprecated`
`565`	`565`	`*`
`566`		`- * @return Definition the current instance`
	`566`	`+ * @return $this`
`567`	`567`	`*`
`568`	`568`	`* @throws InvalidArgumentException When the message template is invalid.`
`569`	`569`	`*/`
`@@ -642,7 +642,7 @@ public function getConfigurator()`
`642`	`642`	`*`
`643`	`643`	`* @param string[] $types`
`644`	`644`	`*`
`645`		`- * @return Definition The current instance`
	`645`	`+ * @return $this`
`646`	`646`	`*/`
`647`	`647`	`public function setAutowiringTypes(array $types)`
`648`	`648`	`{`
`@@ -670,7 +670,7 @@ public function isAutowired()`
`670`	`670`	`*`
`671`	`671`	`* @param bool $autowired`
`672`	`672`	`*`
`673`		`- * @return Definition The current instance`
	`673`	`+ * @return $this`
`674`	`674`	`*/`
`675`	`675`	`public function setAutowired($autowired)`
`676`	`676`	`{`
`@@ -694,7 +694,7 @@ public function getAutowiringTypes()`
`694`	`694`	`*`
`695`	`695`	`* @param string $type`
`696`	`696`	`*`
`697`		`- * @return Definition The current instance`
	`697`	`+ * @return $this`
`698`	`698`	`*/`
`699`	`699`	`public function addAutowiringType($type)`
`700`	`700`	`{`
`@@ -708,7 +708,7 @@ public function addAutowiringType($type)`
`708`	`708`	`*`
`709`	`709`	`* @param string $type`
`710`	`710`	`*`
`711`		`- * @return Definition The current instance`
	`711`	`+ * @return $this`
`712`	`712`	`*/`
`713`	`713`	`public function removeAutowiringType($type)`
`714`	`714`	`{`