Skip to content

Commit 5ee4370

Browse files
jenkins-botGerrit Code Review
authored andcommitted
Merge "Re-enable Phan and fix warnings for `data-model-serialization'"
2 parents bd2f9cf + 9db2aaa commit 5ee4370

File tree

4 files changed

+3
-4
lines changed

4 files changed

+3
-4
lines changed

.phan/config.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
$cfg['exclude_analysis_directory_list'] = array_merge(
6666
$cfg['exclude_analysis_directory_list'],
6767
[
68-
'lib/packages/wikibase/data-model-serialization/src/',
6968
'lib/packages/wikibase/data-model-services/src/',
7069
'lib/packages/wikibase/internal-serialization/src/',
7170
'../../extensions/Babel/',

lib/packages/wikibase/data-model-serialization/src/Deserializers/SnakDeserializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ private function needsDataTypeLookup( string $valueType ): bool {
159159
array_keys( $this->dataTypeToValueTypeMap, $valueType, true )
160160
);
161161

162-
return !empty( array_intersect( $possibleDataTypeKeys, array_keys( $this->deserializerBuilders ) ) );
162+
return array_intersect( $possibleDataTypeKeys, array_keys( $this->deserializerBuilders ) ) !== [];
163163
}
164164

165165
/**

lib/packages/wikibase/data-model-serialization/src/Serializers/AliasGroupListSerializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function __construct( AliasGroupSerializer $aliasGroupSerializer, bool $u
2626

2727
/**
2828
* @param AliasGroupList $object
29-
* @return array|::stdClass
29+
* @return array|\stdClass
3030
*/
3131
public function serialize( $object ) {
3232
$this->assertIsSerializerFor( $object );

lib/packages/wikibase/data-model-serialization/src/Serializers/MapSerializer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct( bool $useObjectsForEmptyMaps ) {
3131
* @return array|\stdClass
3232
*/
3333
protected function serializeMap( array $serialization ) {
34-
if ( $this->useObjectsForEmptyMaps && empty( $serialization ) ) {
34+
if ( $this->useObjectsForEmptyMaps && $serialization === [] ) {
3535
$serialization = (object)$serialization;
3636
}
3737

0 commit comments

Comments
 (0)