Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit fde1387e375a · 2019-08-14T14:37:46.000+02:00
* 4.3:
  Remove superfluous phpdoc tags
diff --git a/Store/MemcachedStore.php b/Store/MemcachedStore.php
@@ -38,8 +38,7 @@ public static function isSupported()
     }
 
     /**
-     * @param \Memcached $memcached
-     * @param int        $initialTtl the expiration delay of locks in seconds
+     * @param int $initialTtl the expiration delay of locks in seconds
      */
     public function __construct(\Memcached $memcached, int $initialTtl = 300)
     {

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,7 @@ public static function isSupported()`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`/**`
`41`		`- * @param \Memcached $memcached`
`42`		`- * @param int $initialTtl the expiration delay of locks in seconds`
	`41`	`+ * @param int $initialTtl the expiration delay of locks in seconds`
`43`	`42`	`*/`
`44`	`43`	`public function __construct(\Memcached $memcached, int $initialTtl = 300)`
`45`	`44`	`{`