summaryrefslogtreecommitdiff
path: root/includes/utils/UIDGenerator.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-06-04 07:31:04 +0200
committerPierre Schmitz <pierre@archlinux.de>2015-06-04 07:58:39 +0200
commitf6d65e533c62f6deb21342d4901ece24497b433e (patch)
treef28adf0362d14bcd448f7b65a7aaf38650f923aa /includes/utils/UIDGenerator.php
parentc27b2e832fe25651ef2410fae85b41072aae7519 (diff)
Update to MediaWiki 1.25.1
Diffstat (limited to 'includes/utils/UIDGenerator.php')
-rw-r--r--includes/utils/UIDGenerator.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/utils/UIDGenerator.php b/includes/utils/UIDGenerator.php
index 5346afa6..92415877 100644
--- a/includes/utils/UIDGenerator.php
+++ b/includes/utils/UIDGenerator.php
@@ -119,6 +119,7 @@ class UIDGenerator {
/**
* @param array $info (UIDGenerator::millitime(), counter, clock sequence)
* @return string 88 bits
+ * @throws MWException
*/
protected function getTimestampedID88( array $info ) {
list( $time, $counter ) = $info;
@@ -163,6 +164,7 @@ class UIDGenerator {
/**
* @param array $info (UIDGenerator::millitime(), counter, clock sequence)
* @return string 128 bits
+ * @throws MWException
*/
protected function getTimestampedID128( array $info ) {
list( $time, $counter, $clkSeq ) = $info;
@@ -260,6 +262,7 @@ class UIDGenerator {
* @param int $count Number of IDs to return (1 to 10000)
* @param int $flags (supports UIDGenerator::QUICK_VOLATILE)
* @return array Ordered list of float integer values
+ * @throws MWException
*/
protected function getSequentialPerNodeIDs( $bucket, $bits, $count, $flags ) {
if ( $count <= 0 ) {
@@ -278,7 +281,7 @@ class UIDGenerator {
if ( ( $flags & self::QUICK_VOLATILE ) && PHP_SAPI !== 'cli' ) {
try {
$cache = ObjectCache::newAccelerator( array() );
- } catch ( MWException $e ) {
+ } catch ( Exception $e ) {
// not supported
}
}
@@ -436,6 +439,7 @@ class UIDGenerator {
/**
* @param array $time Result of UIDGenerator::millitime()
* @return string 46 MSBs of "milliseconds since epoch" in binary (rolls over in 4201)
+ * @throws MWException
*/
protected function millisecondsSinceEpochBinary( array $time ) {
list( $sec, $msec ) = $time;