Skip to content

Commit 4e74c70

Browse files
lucaswerkmeisterWMDE bot
authored andcommitted
Enable MediaWiki.Arrays.TrailingComma sniff
Enforce trailing commas in multi-line arrays, and no trailing commas in single-line arrays. In one line in FullStatementRdfBuilderTest, the extra comma pushes the line length over the hard limit (140 → 141 characters), so split the array across multiple lines to keep it below the limit. The same thing happens in one line in RdfBuilderTest, so split the DatabaseEntitySource constructor call across multiple lines. Bug: T325532 Change-Id: I184b019ba7ab8b435cd0774cac04011dac4585bd
1 parent 2aeddbe commit 4e74c70

39 files changed

+513
-513
lines changed

src/Deserializers/DeserializerFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct(
4848
public function newEntityDeserializer(): DispatchingDeserializer {
4949
return new DispatchingDeserializer( [
5050
$this->newItemDeserializer(),
51-
$this->newPropertyDeserializer()
51+
$this->newPropertyDeserializer(),
5252
] );
5353
}
5454

src/Deserializers/StatementDeserializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class StatementDeserializer implements DispatchableDeserializer {
2525
private static $rankIds = [
2626
'deprecated' => Statement::RANK_DEPRECATED,
2727
'normal' => Statement::RANK_NORMAL,
28-
'preferred' => Statement::RANK_PREFERRED
28+
'preferred' => Statement::RANK_PREFERRED,
2929
];
3030

3131
/**

src/Serializers/AliasGroupSerializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private function getSerialized( AliasGroup $aliasGroup ) {
4646
foreach ( $aliasGroup->getAliases() as $value ) {
4747
$result = [
4848
'language' => $language,
49-
'value' => $value
49+
'value' => $value,
5050
];
5151

5252
if ( $aliasGroup instanceof AliasGroupFallback ) {

src/Serializers/ItemSerializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function serialize( $object ) {
9696

9797
private function getSerialized( Item $item ) {
9898
$serialization = [
99-
'type' => $item->getType()
99+
'type' => $item->getType(),
100100
];
101101

102102
$this->addIdToSerialization( $item, $serialization );

src/Serializers/ReferenceSerializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private function getSerialized( Reference $reference ) {
6161
return [
6262
'hash' => $reference->getHash(),
6363
'snaks' => $this->snaksSerializer->serialize( $reference->getSnaks() ),
64-
'snaks-order' => $this->buildSnakListOrderList( $reference->getSnaks() )
64+
'snaks-order' => $this->buildSnakListOrderList( $reference->getSnaks() ),
6565
];
6666
}
6767

src/Serializers/SerializerFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private function shouldSerializeReferenceSnaksWithHash() {
108108
public function newEntitySerializer() {
109109
return new DispatchingSerializer( [
110110
$this->newItemSerializer(),
111-
$this->newPropertySerializer()
111+
$this->newPropertySerializer(),
112112
] );
113113
}
114114

src/Serializers/SiteLinkSerializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private function getSerialized( SiteLink $siteLink ) {
5050
return [
5151
'site' => $siteLink->getSiteId(),
5252
'title' => $siteLink->getPageName(),
53-
'badges' => $this->serializeBadges( $siteLink->getBadges() )
53+
'badges' => $this->serializeBadges( $siteLink->getBadges() ),
5454
];
5555
}
5656

src/Serializers/StatementSerializer.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class StatementSerializer implements DispatchableSerializer {
2121
private $rankLabels = [
2222
Statement::RANK_DEPRECATED => 'deprecated',
2323
Statement::RANK_NORMAL => 'normal',
24-
Statement::RANK_PREFERRED => 'preferred'
24+
Statement::RANK_PREFERRED => 'preferred',
2525
];
2626

2727
/**
@@ -82,7 +82,7 @@ public function serialize( $object ) {
8282
private function getSerialized( Statement $statement ) {
8383
$serialization = [
8484
'mainsnak' => $this->mainSnakSerializer->serialize( $statement->getMainSnak() ),
85-
'type' => 'statement'
85+
'type' => 'statement',
8686
];
8787

8888
$this->addQualifiersToSerialization( $statement, $serialization );

tests/integration/EntityDeserializationCompatibilityTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private function getEntitySerializationsFromDir( $dir ) {
7474
if ( $fileInfo->getExtension() === 'json' ) {
7575
$argumentLists[] = [
7676
$fileInfo->getFilename(),
77-
json_decode( file_get_contents( $fileInfo->getPathname() ), true )
77+
json_decode( file_get_contents( $fileInfo->getPathname() ), true ),
7878
];
7979
}
8080
}

tests/integration/ReferenceSerializationRoundtripTest.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,19 @@ public function testSnakSerializationRoundtrips( Reference $reference ) {
4040
public function referenceProvider() {
4141
return [
4242
[
43-
new Reference()
43+
new Reference(),
4444
],
4545
[
4646
new Reference( new SnakList( [
47-
new PropertyNoValueSnak( 42 )
48-
] ) )
47+
new PropertyNoValueSnak( 42 ),
48+
] ) ),
4949
],
5050
[
5151
new Reference( new SnakList( [
5252
new PropertyNoValueSnak( 42 ),
5353
new PropertySomeValueSnak( 24 ),
54-
new PropertyNoValueSnak( 24 )
55-
] ) )
54+
new PropertyNoValueSnak( 24 ),
55+
] ) ),
5656
],
5757
];
5858
}

0 commit comments

Comments
 (0)