Skip to content

Commit baaa84a

Browse files
jenkins-botGerrit Code Review
jenkins-bot
authored and
Gerrit Code Review
committed
Merge "GQL: Remove Value model"
2 parents 64f567a + d9b722e commit baaa84a

File tree

9 files changed

+21
-35
lines changed

9 files changed

+21
-35
lines changed

‎repo/WikibaseRepo.datatypes.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
'globe' => Type::nonNull( Type::string() ),
223223
],
224224
'resolveField' => function ( Statement|PropertyValuePair $valueProvider, $args, $context, ResolveInfo $info ) {
225-
return $valueProvider->value->content
225+
return $valueProvider->value
226226
->getArrayValue()[$info->fieldName] ?? null;
227227
},
228228
] );
@@ -262,7 +262,7 @@
262262
'text' => Type::nonNull( Type::string() ),
263263
],
264264
'resolveField' => function ( Statement|PropertyValuePair $valueProvider, $args, $context, ResolveInfo $info ) {
265-
return $valueProvider->value->content
265+
return $valueProvider->value
266266
->getArrayValue()[$info->fieldName] ?? null;
267267
},
268268
] );
@@ -311,7 +311,7 @@
311311
'upperBound' => Type::string(),
312312
],
313313
'resolveField' => function ( Statement|PropertyValuePair $valueProvider, $args, $context, ResolveInfo $info ) {
314-
return $valueProvider->value->content
314+
return $valueProvider->value
315315
->getArrayValue()[$info->fieldName] ?? null;
316316
},
317317
] );
@@ -395,7 +395,7 @@
395395
'calendarModel' => Type::nonNull( Type::string() ),
396396
],
397397
'resolveField' => function ( Statement|PropertyValuePair $valueProvider, $args, $context, ResolveInfo $info ) {
398-
$value = $valueProvider->value->content->getArrayValue();
398+
$value = $valueProvider->value->getArrayValue();
399399
$value['calendarModel'] = $value['calendarmodel'] ?? null; // prefer camel case over all lowercase
400400

401401
return $value[$info->fieldName] ?? null;
@@ -540,7 +540,7 @@
540540
'type' => Type::nonNull( Type::string() ),
541541
'resolve' => function( Statement|PropertyValuePair $valueProvider ) {
542542
/** @var EntityIdValue $idValue */
543-
$idValue = $valueProvider->value->content;
543+
$idValue = $valueProvider->value;
544544
'@phan-var EntityIdValue $idValue';
545545

546546
return $idValue->getEntityId()->getSerialization();
@@ -553,7 +553,7 @@
553553
],
554554
'resolve' => function( Statement|PropertyValuePair $valueProvider, array $args ) use( $itemLabelsResolver ) {
555555
/** @var EntityIdValue $idValue */
556-
$idValue = $valueProvider->value->content;
556+
$idValue = $valueProvider->value;
557557
'@phan-var EntityIdValue $idValue';
558558

559559
/** @var ItemId $itemId */
@@ -609,7 +609,7 @@
609609
'type' => Type::nonNull( Type::string() ),
610610
'resolve' => function( Statement|PropertyValuePair $valueProvider ) {
611611
/** @var EntityIdValue $idValue */
612-
$idValue = $valueProvider->value->content;
612+
$idValue = $valueProvider->value;
613613
'@phan-var EntityIdValue $idValue';
614614

615615
return $idValue->getEntityId()->getSerialization();
@@ -622,7 +622,7 @@
622622
],
623623
'resolve' => function( Statement|PropertyValuePair $valueProvider, array $args ) use( $labelsResolver ) {
624624
/** @var EntityIdValue $idValue */
625-
$idValue = $valueProvider->value->content;
625+
$idValue = $valueProvider->value;
626626
'@phan-var EntityIdValue $idValue';
627627

628628
/** @var PropertyId $propertyId */

‎repo/domains/reuse/src/Domain/Model/PropertyValuePair.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@
22

33
namespace Wikibase\Repo\Domains\Reuse\Domain\Model;
44

5+
use DataValues\DataValue;
6+
57
/**
68
* @license GPL-2.0-or-later
79
*/
810
class PropertyValuePair {
911

1012
public function __construct(
1113
public readonly PredicateProperty $property,
12-
public readonly ?Value $value,
14+
public readonly ?DataValue $value,
1315
public readonly ValueType $valueType,
1416
) {
1517
}

‎repo/domains/reuse/src/Domain/Model/Statement.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Wikibase\Repo\Domains\Reuse\Domain\Model;
44

5+
use DataValues\DataValue;
56
use Wikibase\DataModel\Statement\StatementGuid;
67

78
/**
@@ -15,7 +16,7 @@ class Statement {
1516
* @param Qualifiers $qualifiers
1617
* @param Reference[] $references
1718
* @param PredicateProperty $property
18-
* @param Value|null $value
19+
* @param DataValue|null $value
1920
* @param ValueType $valueType
2021
*/
2122
public function __construct(
@@ -24,7 +25,7 @@ public function __construct(
2425
public readonly Qualifiers $qualifiers,
2526
public readonly array $references,
2627
public readonly PredicateProperty $property,
27-
public readonly ?Value $value,
28+
public readonly ?DataValue $value,
2829
public readonly ValueType $valueType
2930
) {
3031
}

‎repo/domains/reuse/src/Domain/Model/Value.php‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎repo/domains/reuse/src/Domain/Services/StatementReadModelConverter.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
use Wikibase\Repo\Domains\Reuse\Domain\Model\Rank;
1919
use Wikibase\Repo\Domains\Reuse\Domain\Model\Reference;
2020
use Wikibase\Repo\Domains\Reuse\Domain\Model\Statement;
21-
use Wikibase\Repo\Domains\Reuse\Domain\Model\Value;
2221
use Wikibase\Repo\Domains\Reuse\Domain\Model\ValueType;
2322

2423
/**
@@ -86,7 +85,7 @@ private function convertSnakToPropertyValuePair( Snak $snak ): PropertyValuePair
8685

8786
return new PropertyValuePair(
8887
new PredicateProperty( $snak->getPropertyId(), $dataType ),
89-
$snak instanceof PropertyValueSnak ? new Value( $snak->getDataValue() ) : null,
88+
$snak instanceof PropertyValueSnak ? $snak->getDataValue() : null,
9089
ValueType::fromString( $snak->getType() ),
9190
);
9291
}

‎repo/domains/reuse/src/Infrastructure/GraphQL/Schema/StringValueType.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function __construct() {
1717
'fields' => [
1818
'content' => [
1919
'type' => Type::nonNull( Type::string() ),
20-
'resolve' => fn( Statement|PropertyValuePair $valueProvider ) => $valueProvider->value->content->getValue(),
20+
'resolve' => fn( Statement|PropertyValuePair $valueProvider ) => $valueProvider->value->getValue(),
2121
],
2222
],
2323
] );

‎repo/domains/reuse/src/Infrastructure/GraphQL/Schema/ValueType.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public function __construct( array $valueTypeCallbacks ) {
2020
'fields' => [
2121
'content' => [
2222
'type' => Type::nonNull( new JsonType() ),
23-
'resolve' => fn( Statement|PropertyValuePair $valueProvider ) => $valueProvider->value->content->getArrayValue(),
23+
'resolve' => fn( Statement|PropertyValuePair $valueProvider ) => $valueProvider->value->getArrayValue(),
2424
],
2525
],
2626
] );

‎repo/domains/reuse/src/WbReuse.ServiceWiring.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
'fields' => [ 'id' => Type::nonNull( Type::string() ) ],
3838
'resolveField' => function( Statement|PropertyValuePair $valueProvider, $args, $context, ResolveInfo $info ) {
3939

40-
return $valueProvider->value->content
41-
->getArrayValue()[ $info->fieldName ] ?? null;
40+
return $valueProvider->value->getArrayValue()[ $info->fieldName ] ?? null;
4241
},
4342
] );
4443
},

‎repo/domains/reuse/tests/phpunit/Infrastructure/DataAccess/EntityLookupItemsBatchRetrieverTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public function testGetItemsWithStatements(): void {
166166

167167
$this->assertSame(
168168
'stringValue',
169-
$qualifiers[0]->value->content->getValue()
169+
$qualifiers[0]->value->getValue()
170170
);
171171

172172
$this->assertSame(
@@ -271,7 +271,7 @@ public function testGetItemWithStatementsWithValue(): void {
271271

272272
$this->assertSame(
273273
'stringValue',
274-
$statementWithStringValue[0]->value->content->getValue()
274+
$statementWithStringValue[0]->value->getValue()
275275
);
276276

277277
$this->assertSame(
@@ -286,7 +286,7 @@ public function testGetItemWithStatementsWithValue(): void {
286286

287287
$this->assertSame(
288288
$itemValueItemId,
289-
$statementWithItemValue[0]->value->content->getEntityId()->getSerialization()
289+
$statementWithItemValue[0]->value->getEntityId()->getSerialization()
290290
);
291291

292292
$this->assertSame(

0 commit comments

Comments
 (0)