Merge branch '3.1' into 3.2

* 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

Author: nicolas-grekas

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)
     {