Merge branch '3.4' into 4.3

nicolas-grekas · nicolas-grekas · commit 1294be813ca1 · 2019-08-14T14:26:46.000+02:00
* 3.4:
  Remove superfluous phpdoc tags
diff --git a/Store/CombinedStore.php b/Store/CombinedStore.php
@@ -37,8 +37,7 @@ class CombinedStore implements StoreInterface, LoggerAwareInterface
     private $strategy;
 
     /**
-     * @param StoreInterface[]  $stores   The list of synchronized stores
-     * @param StrategyInterface $strategy
+     * @param StoreInterface[] $stores The list of synchronized stores
      *
      * @throws InvalidArgumentException
      */
diff --git a/Store/MemcachedStore.php b/Store/MemcachedStore.php
@@ -37,8 +37,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
`@@ -37,8 +37,7 @@ class CombinedStore implements StoreInterface, LoggerAwareInterface`
`37`	`37`	`private $strategy;`
`38`	`38`
`39`	`39`	`/**`
`40`		`- * @param StoreInterface[] $stores The list of synchronized stores`
`41`		`- * @param StrategyInterface $strategy`
	`40`	`+ * @param StoreInterface[] $stores The list of synchronized stores`
`42`	`41`	`*`
`43`	`42`	`* @throws InvalidArgumentException`
`44`	`43`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ public static function isSupported()`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`		`- * @param \Memcached $memcached`
`41`		`- * @param int $initialTtl the expiration delay of locks in seconds`
	`40`	`+ * @param int $initialTtl the expiration delay of locks in seconds`
`42`	`41`	`*/`
`43`	`42`	`public function __construct(\Memcached $memcached, int $initialTtl = 300)`
`44`	`43`	`{`