Merge "Pass phpcs-strict on maintenance/ (8/8)"

[lhc/web/wiklou.git] / maintenance / syncFileBackend.php

diff --git a/maintenance/syncFileBackend.php b/maintenance/syncFileBackend.php
index e5d755e..c505b14 100644 (file)
--- a/maintenance/syncFileBackend.php
+++ b/maintenance/syncFileBackend.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( __DIR__ . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
 /**
  * Maintenance script that syncs one file backend to another based on
@@ -141,12 +141,12 @@ class SyncFileBackend extends Maintenance {
         * Sync $dst backend to $src backend based on the $src logs given after $start.
         * Returns the journal entry ID this advanced to and handled (inclusive).
         *
-        * @param $src FileBackend
-        * @param $dst FileBackend
-        * @param $start integer Starting journal position
-        * @param $end integer Starting journal position
-        * @param $callback Closure Callback to update any position file
-        * @return integer|false Journal entry ID or false if there are none
+        * @param FileBackend $src
+        * @param FileBackend $dst
+        * @param int $start Starting journal position
+        * @param int $end Starting journal position
+        * @param Closure $callback Callback to update any position file
+        * @return int|bool Journal entry ID or false if there are none
         */
        protected function syncBackends(
                FileBackend $src, FileBackend $dst, $start, $end, Closure $callback
@@ -198,9 +198,9 @@ class SyncFileBackend extends Maintenance {
        /**
         * Sync particular files of backend $src to the corresponding $dst backend files
         *
-        * @param $paths Array
-        * @param $src FileBackend
-        * @param $dst FileBackend
+        * @param array $paths
+        * @param FileBackend $src
+        * @param FileBackend $dst
         * @return Status
         */
        protected function syncFileBatch( array $paths, FileBackend $src, FileBackend $dst ) {
@@ -221,6 +221,9 @@ class SyncFileBackend extends Maintenance {
                        return $status;
                }
 
+               $src->preloadFileStat( array( 'srcs' => $sPaths, 'latest' => 1 ) );
+               $dst->preloadFileStat( array( 'srcs' => $dPaths, 'latest' => 1 ) );
+
                $ops = array();
                $fsFiles = array();
                foreach ( $sPaths as $i => $sPath ) {
@@ -273,8 +276,8 @@ class SyncFileBackend extends Maintenance {
        /**
         * Substitute the backend name of storage paths with that of a given one
         *
-        * @param $paths Array|string List of paths or single string path
-        * @return Array|string
+        * @param array|string $paths List of paths or single string path
+        * @return array|string
         */
        protected function replaceNamePaths( $paths, FileBackend $backend ) {
                return preg_replace(
@@ -296,4 +299,4 @@ class SyncFileBackend extends Maintenance {
 }
 
 $maintClass = "SyncFileBackend";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once RUN_MAINTENANCE_IF_MAIN;