);
foreach ( $res as $row ) {
- $timestamps[$row->wl_namespace][$row->wl_title] = $row->wl_notificationtimestamp;
+ $timestamps[$row->wl_namespace][$row->wl_title] =
+ wfTimestampOrNull( TS_MW, $row->wl_notificationtimestamp );
}
return $timestamps;
'user' => 0,
'user_text' => 'User',
'namespace' => NS_USER,
- 'title' => 'UTSysop',
- 'params' => [
- '4::userid' => 1,
- ],
+ 'title' => 'UTSysop'
],
[
- 'text' => 'User account UTSysop was created by User',
- 'api' => [
- 'userid' => 1,
- ],
+ 'text' => 'User account UTSysop was created by User'
],
],
];
* @dataProvider provideCreate2LogDatabaseRows
*/
public function testCreate2LogDatabaseRows( $row, $extra ) {
+ // Make UTSysop user and use its user_id (sequence does not reset to 1 for postgres)
+ $user = static::getTestSysop()->getUser();
+ $row['params']['4::userid'] = $user->getId();
+ $extra['api']['userid'] = $user->getId();
$this->doTestLogFormatter( $row, $extra );
}
'user' => 0,
'user_text' => 'Sysop',
'namespace' => NS_USER,
- 'title' => 'UTSysop',
- 'params' => [
- '4::userid' => 1,
- ],
+ 'title' => 'UTSysop'
],
[
- 'text' => 'User account UTSysop was created by Sysop and password was sent by email',
- 'api' => [
- 'userid' => 1,
- ],
+ 'text' => 'User account UTSysop was created by Sysop and password was sent by email'
],
],
];
* @dataProvider provideByemailLogDatabaseRows
*/
public function testByemailLogDatabaseRows( $row, $extra ) {
+ // Make UTSysop user and use its user_id (sequence does not reset to 1 for postgres)
+ $user = static::getTestSysop()->getUser();
+ $row['params']['4::userid'] = $user->getId();
+ $extra['api']['userid'] = $user->getId();
$this->doTestLogFormatter( $row, $extra );
}
*/
public function testGetDateCond( $inputYear, $inputMonth, $inputDay, $expected ) {
$pager = $this->getMockForAbstractClass( 'RangeChronologicalPager' );
- $this->assertEquals( $expected, $pager->getDateCond( $inputYear, $inputMonth, $inputDay ) );
+ $this->assertEquals(
+ $expected,
+ wfTimestamp( TS_MW, $pager->getDateCond( $inputYear, $inputMonth, $inputDay ) )
+ );
}
/**