Merge "Improve "selfmove" message's wording"

[lhc/web/wiklou.git] / includes / libs / rdbms / ChronologyProtector.php

diff --git a/includes/libs/rdbms/ChronologyProtector.php b/includes/libs/rdbms/ChronologyProtector.php
index 8b1aabe..8121654 100644 (file)
--- a/includes/libs/rdbms/ChronologyProtector.php
+++ b/includes/libs/rdbms/ChronologyProtector.php
@@ -61,9 +61,9 @@ class ChronologyProtector implements LoggerAwareInterface {
        /** @var float[] Map of (DB master name => 1) */
        protected $shutdownTouchDBs = [];
 
-       /** @var integer Seconds to store positions */
+       /** @var int Seconds to store positions */
        const POSITION_TTL = 60;
-       /** @var integer Max time to wait for positions to appear */
+       /** @var int Max time to wait for positions to appear */
        const POS_WAIT_TIMEOUT = 5;
 
        /**
@@ -315,7 +315,7 @@ class ChronologyProtector implements LoggerAwareInterface {
         * @return array
         */
        private static function mergePositions( $curValue, array $shutdownPositions ) {
-               /** @var $curPositions DBMasterPos[] */
+               /** @var DBMasterPos[] $curPositions */
                if ( $curValue === false ) {
                        $curPositions = $shutdownPositions;
                } else {