Merge "Fix more UnitTests for databases that do not use integer timestamps"

diff --combined tests/phpunit/includes/EditPageTest.php
index b64a54e,d2e4c46..00eba30
--- 1/tests/phpunit/includes/EditPageTest.php
--- 2/tests/phpunit/includes/EditPageTest.php
+++ b/tests/phpunit/includes/EditPageTest.php
@@@ -48,7 -48,7 +48,7 @@@ class EditPageTest extends MediaWikiTes
                $dbw = wfGetDB( DB_MASTER );
  
                $dbw->update( 'revision',
-                       array( 'rev_timestamp' => $timestamp ),
+                       array( 'rev_timestamp' => $dbw->timestamp( $timestamp ) ),
                        array( 'rev_id' => $page->getLatest() ) );
  
                $page->clear();
@@@ -59,8 -59,8 +59,8 @@@
         * wrapper around assertEquals() which calls rrtrim() to normalize the
         * expected and actual texts.
         */
 -      function assertEditedTextEquals( $expected, $actual, $msg='' ) {
 -              return $this->assertEquals( rtrim($expected), rtrim($actual), $msg );
 +      function assertEditedTextEquals( $expected, $actual, $msg = '' ) {
 +              return $this->assertEquals( rtrim( $expected ), rtrim( $actual ), $msg );
        }
  
        /**
@@@ -209,7 -209,8 +209,7 @@@
        }
  
        public static function provideSectionEdit() {
 -              $text =
 -'Intro
 +              $text = 'Intro
  
  == one ==
  first section.
@@@ -218,19 -219,19 +218,19 @@@
  second section.
  ';
  
 -              $sectionOne =
 -'== one ==
 +              $sectionOne = '== one ==
  hello
  ';
  
 -              $newSection =
 -'== new section ==
 +              $newSection = '== new section ==
  
  hello
  ';
  
 -              $textWithNewSectionOne = preg_replace( '/== one ==.*== two ==/ms',
 -                                                                              "$sectionOne\n== two ==", $text );
 +              $textWithNewSectionOne = preg_replace(
 +                      '/== one ==.*== two ==/ms',
 +                      "$sectionOne\n== two ==", $text
 +              );
  
                $textWithNewSectionAdded = "$text\n$newSection";
  
@@@ -342,12 -343,12 +342,12 @@@
                );
  
                // see whether it makes a difference who did the base edit
 -              $testsWithAdam = array_map( function( $test ) {
 +              $testsWithAdam = array_map( function ( $test ) {
                        $test[0] = 'Adam'; // change base edit user
                        return $test;
                }, $tests );
  
 -              $testsWithBerta = array_map( function( $test ) {
 +              $testsWithBerta = array_map( function ( $test ) {
                        $test[0] = 'Berta'; // change base edit user
                        return $test;
                }, $tests );
@@@ -359,7 -360,7 +359,7 @@@
         * @dataProvider provideAutoMerge
         */
        public function testAutoMerge( $baseUser, $text, $adamsEdit, $bertasEdit,
 -                              $expectedCode, $expectedText, $message = null
 +              $expectedCode, $expectedText, $message = null
        ) {
                $this->checkHasDiff3();
  
@@@ -377,7 -378,7 +377,7 @@@
                );
  
                $page = $this->assertEdit( 'EditPageTest_testAutoMerge', null,
 -                                      $baseUser, $baseEdit, null, null, __METHOD__ );
 +                      $baseUser, $baseEdit, null, null, __METHOD__ );
  
                $this->forceRevisionDate( $page, '20120101000000' );
  

diff --combined tests/phpunit/includes/api/ApiEditPageTest.php
index da5eb33,5f8cee6..1efbaea
--- 1/tests/phpunit/includes/api/ApiEditPageTest.php
--- 2/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@@ -43,15 -43,14 +43,15 @@@ class ApiEditPageTest extends ApiTestCa
                parent::teardown();
        }
  
 -      function testEdit( ) {
 +      function testEdit() {
                $name = 'Help:ApiEditPageTest_testEdit'; // assume Help namespace to default to wikitext
  
                // -- test new page --------------------------------------------
                $apiResult = $this->doApiRequestWithToken( array(
 -                              'action' => 'edit',
 -                              'title' => $name,
 -                              'text' => 'some text', ) );
 +                      'action' => 'edit',
 +                      'title' => $name,
 +                      'text' => 'some text',
 +              ) );
                $apiResult = $apiResult[0];
  
                // Validate API result data
@@@ -66,10 -65,9 +66,10 @@@
  
                // -- test existing page, no change ----------------------------
                $data = $this->doApiRequestWithToken( array(
 -                              'action' => 'edit',
 -                              'title' => $name,
 -                              'text' => 'some text', ) );
 +                      'action' => 'edit',
 +                      'title' => $name,
 +                      'text' => 'some text',
 +              ) );
  
                $this->assertEquals( 'Success', $data[0]['edit']['result'] );
  
@@@ -78,10 -76,9 +78,10 @@@
  
                // -- test existing page, with change --------------------------
                $data = $this->doApiRequestWithToken( array(
 -                              'action' => 'edit',
 -                              'title' => $name,
 -                              'text' => 'different text' ) );
 +                      'action' => 'edit',
 +                      'title' => $name,
 +                      'text' => 'different text'
 +              ) );
  
                $this->assertEquals( 'Success', $data[0]['edit']['result'] );
  
@@@ -97,7 -94,7 +97,7 @@@
                );
        }
  
 -      function testNonTextEdit( ) {
 +      function testNonTextEdit() {
                $name = 'Dummy:ApiEditPageTest_testNonTextEdit';
                $data = serialize( 'some bla bla text' );
  
@@@ -161,13 -158,13 +161,13 @@@
                if ( $text !== null ) {
                        if ( $text === '' ) {
                                // can't create an empty page, so create it with some content
 -                              list( $re,, ) = $this->doApiRequestWithToken( array(
 +                              list( $re, , ) = $this->doApiRequestWithToken( array(
                                        'action' => 'edit',
                                        'title' => $name,
                                        'text' => '(dummy)', ) );
                        }
  
 -                      list( $re,, ) = $this->doApiRequestWithToken( array(
 +                      list( $re, , ) = $this->doApiRequestWithToken( array(
                                'action' => 'edit',
                                'title' => $name,
                                'text' => $text, ) );
@@@ -176,7 -173,7 +176,7 @@@
                }
  
                // -- try append/prepend --------------------------------------------
 -              list( $re,, ) = $this->doApiRequestWithToken( array(
 +              list( $re, , ) = $this->doApiRequestWithToken( array(
                        'action' => 'edit',
                        'title' => $name,
                        $op . 'text' => $append, ) );
@@@ -224,12 -221,12 +224,12 @@@
  
                // try to save edit, expect conflict
                try {
 -                      list( $re,, ) = $this->doApiRequestWithToken( array(
 +                      list( $re, , ) = $this->doApiRequestWithToken( array(
                                'action' => 'edit',
                                'title' => $name,
                                'text' => 'nix bar!',
                                'basetimestamp' => $baseTime,
 -                              ), null, self::$users['sysop']->user );
 +                      ), null, self::$users['sysop']->user );
  
                        $this->fail( 'edit conflict expected' );
                } catch ( UsageException $ex ) {
@@@ -267,7 -264,7 +267,7 @@@
                $this->forceRevisionDate( $rpage, '20120101020202' );
  
                // try to save edit; should work, because we follow the redirect
 -              list( $re,, ) = $this->doApiRequestWithToken( array(
 +              list( $re, , ) = $this->doApiRequestWithToken( array(
                        'action' => 'edit',
                        'title' => $rname,
                        'text' => 'nix bar!',
@@@ -280,7 -277,7 +280,7 @@@
  
                // try again, without following the redirect. Should fail.
                try {
 -                      list( $re,, ) = $this->doApiRequestWithToken( array(
 +                      list( $re, , ) = $this->doApiRequestWithToken( array(
                                'action' => 'edit',
                                'title' => $rname,
                                'text' => 'nix bar!',
@@@ -329,7 -326,7 +329,7 @@@
                $this->forceRevisionDate( $rpage, '20120101020202' );
  
                // try to save edit; should work, following the redirect.
 -              list( $re,, ) = $this->doApiRequestWithToken( array(
 +              list( $re, , ) = $this->doApiRequestWithToken( array(
                        'action' => 'edit',
                        'title' => $rname,
                        'text' => 'nix bar!',
@@@ -344,7 -341,7 +344,7 @@@
                $dbw = wfGetDB( DB_MASTER );
  
                $dbw->update( 'revision',
-                       array( 'rev_timestamp' => $timestamp ),
+                       array( 'rev_timestamp' => $dbw->timestamp( $timestamp ) ),
                        array( 'rev_id' => $page->getLatest() ) );
  
                $page->clear();