Merge branch '3.4'

fabpot · fabpot · commit 757edba8d61d · 2017-09-11T14:36:26.000-07:00
* 3.4:
  fixed CS
  fixed CS
  fixed CS
diff --git a/Key.php b/Key.php
@@ -61,7 +61,7 @@ public function resetLifetime()
     }
 
     /**
-     * @param float $ttl The expiration delay of locks in seconds.
+     * @param float $ttl the expiration delay of locks in seconds
      */
     public function reduceLifetime($ttl)
     {
diff --git a/LockInterface.php b/LockInterface.php
@@ -28,7 +28,7 @@ interface LockInterface
      *
      * @param bool $blocking Whether or not the Lock should wait for the release of someone else
      *
-     * @return bool Whether or not the lock had been acquired.
+     * @return bool whether or not the lock had been acquired
      *
      * @throws LockConflictedException If the lock is acquired by someone else in blocking mode
      * @throws LockAcquiringException  If the lock can not be acquired

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function resetLifetime()`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
`64`		`- * @param float $ttl The expiration delay of locks in seconds.`
	`64`	`+ * @param float $ttl the expiration delay of locks in seconds`
`65`	`65`	`*/`
`66`	`66`	`public function reduceLifetime($ttl)`
`67`	`67`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ interface LockInterface`
`28`	`28`	`*`
`29`	`29`	`* @param bool $blocking Whether or not the Lock should wait for the release of someone else`
`30`	`30`	`*`
`31`		`- * @return bool Whether or not the lock had been acquired.`
	`31`	`+ * @return bool whether or not the lock had been acquired`
`32`	`32`	`*`
`33`	`33`	`* @throws LockConflictedException If the lock is acquired by someone else in blocking mode`
`34`	`34`	`* @throws LockAcquiringException If the lock can not be acquired`