Merge "Indicate the actual version of HHVM in use"

[lhc/web/wiklou.git] / tests / phpunit / maintenance / backupTextPassTest.php

diff --git a/tests/phpunit/maintenance/backupTextPassTest.php b/tests/phpunit/maintenance/backupTextPassTest.php
index 8a297b1..a37a97c 100644 (file)
--- a/tests/phpunit/maintenance/backupTextPassTest.php
+++ b/tests/phpunit/maintenance/backupTextPassTest.php
@@ -219,8 +219,8 @@ class TextPassDumperTest extends DumpTestCase {
         * Ensures that checkpoint dumps are used and written, by successively increasing the
         * stub size and dumping until the duration crosses a threshold.
         *
-        * @param $checkpointFormat string: Either "file" for plain text or "gzip" for gzipped
-        *                checkpoint files.
+        * @param string $checkpointFormat Either "file" for plain text or "gzip" for gzipped
+        *   checkpoint files.
         */
        private function checkpointHelper( $checkpointFormat = "file" ) {
                // Getting temporary names
@@ -389,7 +389,12 @@ class TextPassDumperTest extends DumpTestCase {
                $this->assertEmpty( $files, "Remaining unchecked files" );
 
                // ... and have dealt with more than one checkpoint file
-               $this->assertGreaterThan( 1, $checkpointFiles, "expected more than 1 checkpoint to have been created. Checkpoint interval is $checkpointAfter seconds, maybe your computer is too fast?" );
+               $this->assertGreaterThan(
+                       1,
+                       $checkpointFiles,
+                       "expected more than 1 checkpoint to have been created. "
+                               . "Checkpoint interval is $checkpointAfter seconds, maybe your computer is too fast?"
+               );
 
                $this->expectETAOutput();
        }
@@ -421,17 +426,15 @@ class TextPassDumperTest extends DumpTestCase {
        /**
         * Creates a stub file that is used for testing the text pass of dumps
         *
-        * @param $fname string: (Optional) Absolute name of the file to write
-        *           the stub into. If this parameter is null, a new temporary
-        *           file is generated that is automatically removed upon
-        *           tearDown.
-        * @param $iterations integer: (Optional) specifies how often the block
-        *           of 3 pages should go into the stub file. The page and
-        *           revision id increase further and further, while the text
-        *           id of the first iteration is reused. The pages and revision
-        *           of iteration > 1 have no corresponding representation in the
-        *           database.
-        * @return string absolute filename of the stub
+        * @param string $fname (Optional) Absolute name of the file to write
+        *   the stub into. If this parameter is null, a new temporary
+        *   file is generated that is automatically removed upon tearDown.
+        * @param int $iterations (Optional) specifies how often the block
+        *   of 3 pages should go into the stub file. The page and
+        *   revision id increase further and further, while the text
+        *   id of the first iteration is reused. The pages and revision
+        *   of iteration > 1 have no corresponding representation in the database.
+        * @return string Absolute filename of the stub
         */
        private function setUpStub( $fname = null, $iterations = 1 ) {
                if ( $fname === null ) {