public function testMergeFieldInfo() {
$msg = wfMessage( 'foo' );
- $req1 = $this->getMock( AuthenticationRequest::class );
+ $req1 = $this->createMock( AuthenticationRequest::class );
$req1->required = AuthenticationRequest::REQUIRED;
$req1->expects( $this->any() )->method( 'getFieldInfo' )->will( $this->returnValue( [
'string1' => [
],
] ) );
- $req2 = $this->getMock( AuthenticationRequest::class );
+ $req2 = $this->createMock( AuthenticationRequest::class );
$req2->required = AuthenticationRequest::REQUIRED;
$req2->expects( $this->any() )->method( 'getFieldInfo' )->will( $this->returnValue( [
'string1' => [
'type' => 'string',
'label' => $msg,
'help' => $msg,
+ 'sensitive' => true,
],
'string3' => [
'type' => 'string',
],
] ) );
- $req3 = $this->getMock( AuthenticationRequest::class );
+ $req3 = $this->createMock( AuthenticationRequest::class );
$req3->required = AuthenticationRequest::REQUIRED;
$req3->expects( $this->any() )->method( 'getFieldInfo' )->will( $this->returnValue( [
'string1' => [
],
] ) );
- $req4 = $this->getMock( AuthenticationRequest::class );
+ $req4 = $this->createMock( AuthenticationRequest::class );
$req4->required = AuthenticationRequest::REQUIRED;
$req4->expects( $this->any() )->method( 'getFieldInfo' )->will( $this->returnValue( [] ) );
$expect = $req1->getFieldInfo();
foreach ( $expect as $name => &$options ) {
$options['optional'] = !empty( $options['optional'] );
+ $options['sensitive'] = !empty( $options['sensitive'] );
}
unset( $options );
$this->assertEquals( $expect, $fields );
$fields = AuthenticationRequest::mergeFieldInfo( [ $req1, $req2 ] );
$expect += $req2->getFieldInfo();
+ $expect['string1']['sensitive'] = true;
$expect['string2']['optional'] = false;
$expect['string3']['optional'] = false;
+ $expect['string3']['sensitive'] = false;
$expect['select']['options']['bar'] = $msg;
$this->assertEquals( $expect, $fields );
$fields = AuthenticationRequest::mergeFieldInfo( [ $req1, $req2 ] );
$expect += $req2->getFieldInfo();
$expect['string1']['optional'] = false;
+ $expect['string1']['sensitive'] = true;
$expect['string3']['optional'] = false;
$expect['select']['optional'] = false;
$expect['select']['options']['bar'] = $msg;
$fields = AuthenticationRequest::mergeFieldInfo( [ $req1, $req2 ] );
$expect = $req1->getFieldInfo() + $req2->getFieldInfo();
+ foreach ( $expect as $name => &$options ) {
+ $options['sensitive'] = !empty( $options['sensitive'] );
+ }
$expect['string1']['optional'] = false;
+ $expect['string1']['sensitive'] = true;
$expect['string2']['optional'] = true;
$expect['string3']['optional'] = true;
$expect['select']['optional'] = false;