Merge "lib/packages: Fix implicit nullable types"

wikimedia · Dec 11, 2024 · 759cd48 · 759cd48
2 parents 4115aea + 114cd5c
commit 759cd48
Show file tree

Hide file tree

Showing 22 changed files with 30 additions and 46 deletions.
diff --git a/.phpcs.xml b/.phpcs.xml
@@ -109,7 +109,6 @@
 	</rule>
 
 	<rule ref="MediaWiki.Usage.NullableType.ExplicitNullableTypes">
-		<exclude-pattern>lib/packages/</exclude-pattern>
 		<exclude-pattern>repo/</exclude-pattern>
 	</rule>
 

diff --git a/lib/packages/wikibase/changes/src/EntityChangeFactory.php b/lib/packages/wikibase/changes/src/EntityChangeFactory.php
@@ -141,8 +141,8 @@ public function newFromFieldData( array $fields ): EntityChange {
 	 */
 	public function newFromUpdate(
 		$action,
-		EntityDocument $oldEntity = null,
-		EntityDocument $newEntity = null
+		?EntityDocument $oldEntity,
+		?EntityDocument $newEntity = null
 	): EntityChange {
 		if ( $oldEntity === null && $newEntity === null ) {
 			throw new InvalidArgumentException( 'Either $oldEntity or $newEntity must be given' );

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/EntityLookupException.php b/lib/packages/wikibase/data-model-services/src/Lookup/EntityLookupException.php
@@ -24,7 +24,7 @@ class EntityLookupException extends RuntimeException {
 	 * @param string|null $message
 	 * @param Exception|null $previous
 	 */
-	public function __construct( EntityId $entityId, $message = null, Exception $previous = null ) {
+	public function __construct( EntityId $entityId, $message = null, ?Exception $previous = null ) {
 		$this->entityId = $entityId;
 
 		parent::__construct(

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/EntityRedirectLookupException.php b/lib/packages/wikibase/data-model-services/src/Lookup/EntityRedirectLookupException.php
@@ -24,7 +24,7 @@ class EntityRedirectLookupException extends RuntimeException {
 	 * @param string|null $message
 	 * @param Exception|null $previous
 	 */
-	public function __construct( EntityId $entityId, $message = null, Exception $previous = null ) {
+	public function __construct( EntityId $entityId, $message = null, ?Exception $previous = null ) {
 		$this->entityId = $entityId;
 
 		parent::__construct(

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/ItemLookupException.php b/lib/packages/wikibase/data-model-services/src/Lookup/ItemLookupException.php
@@ -18,7 +18,7 @@ class ItemLookupException extends EntityLookupException {
 	 * @param string|null $message
 	 * @param Exception|null $previous
 	 */
-	public function __construct( ItemId $itemId, $message = null, Exception $previous = null ) {
+	public function __construct( ItemId $itemId, $message = null, ?Exception $previous = null ) {
 		parent::__construct(
 			$itemId,
 			$message ?: 'Item lookup failed for: ' . $itemId,

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/LabelDescriptionLookupException.php b/lib/packages/wikibase/data-model-services/src/Lookup/LabelDescriptionLookupException.php
@@ -24,7 +24,7 @@ class LabelDescriptionLookupException extends RuntimeException {
 	 * @param string|null $message
 	 * @param Exception|null $previous
 	 */
-	public function __construct( EntityId $entityId, $message = null, Exception $previous = null ) {
+	public function __construct( EntityId $entityId, $message = null, ?Exception $previous = null ) {
 		$this->entityId = $entityId;
 
 		parent::__construct(

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/MaxReferenceDepthExhaustedException.php b/lib/packages/wikibase/data-model-services/src/Lookup/MaxReferenceDepthExhaustedException.php
@@ -33,7 +33,7 @@ public function __construct(
 		array $toIds,
 		$maxDepth,
 		$message = null,
-		Exception $previous = null
+		?Exception $previous = null
 	) {
 		$this->maxDepth = $maxDepth;
 		$message = $message ?: 'Referenced entity id lookup failed: Maximum depth of ' . $maxDepth . ' exhausted.';

diff --git a/...s/wikibase/data-model-services/src/Lookup/MaxReferencedEntityVisitsExhaustedException.php b/...s/wikibase/data-model-services/src/Lookup/MaxReferencedEntityVisitsExhaustedException.php
@@ -33,7 +33,7 @@ public function __construct(
 		array $toIds,
 		$maxEntityVisits,
 		$message = null,
-		Exception $previous = null
+		?Exception $previous = null
 	) {
 		$this->maxEntityVisits = $maxEntityVisits;
 		$message = $message ?: 'Referenced entity id lookup failed: Maximum number of entity visits (' .

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/PropertyDataTypeLookupException.php b/lib/packages/wikibase/data-model-services/src/Lookup/PropertyDataTypeLookupException.php
@@ -24,7 +24,7 @@ class PropertyDataTypeLookupException extends RuntimeException {
 	 * @param string|null $message
 	 * @param Exception|null $previous
 	 */
-	public function __construct( PropertyId $propertyId, $message = null, Exception $previous = null ) {
+	public function __construct( PropertyId $propertyId, $message = null, ?Exception $previous = null ) {
 		$this->propertyId = $propertyId;
 
 		parent::__construct(

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/PropertyLookupException.php b/lib/packages/wikibase/data-model-services/src/Lookup/PropertyLookupException.php
@@ -18,7 +18,7 @@ class PropertyLookupException extends EntityLookupException {
 	 * @param string|null $message
 	 * @param Exception|null $previous
 	 */
-	public function __construct( PropertyId $propertyId, $message = null, Exception $previous = null ) {
+	public function __construct( PropertyId $propertyId, $message = null, ?Exception $previous = null ) {
 		parent::__construct(
 			$propertyId,
 			$message ?: 'Property lookup failed for: ' . $propertyId,

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/ReferencedEntityIdLookupException.php b/lib/packages/wikibase/data-model-services/src/Lookup/ReferencedEntityIdLookupException.php
@@ -42,7 +42,7 @@ public function __construct(
 		PropertyId $propertyId,
 		array $toIds,
 		$message = null,
-		Exception $previous = null
+		?Exception $previous = null
 	) {
 		$this->fromId = $fromId;
 		$this->propertyId = $propertyId;

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/TermLookupException.php b/lib/packages/wikibase/data-model-services/src/Lookup/TermLookupException.php
@@ -29,7 +29,7 @@ public function __construct(
 		EntityId $entityId,
 		array $languageCodes,
 		$message = null,
-		Exception $previous = null
+		?Exception $previous = null
 	) {
 		$this->entityId = $entityId;
 

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/UnknownForeignRepositoryException.php b/lib/packages/wikibase/data-model-services/src/Lookup/UnknownForeignRepositoryException.php
@@ -22,7 +22,7 @@ class UnknownForeignRepositoryException extends InvalidArgumentException {
 	 * @param string|null $message
 	 * @param Exception|null $previous
 	 */
-	public function __construct( $repositoryName, $message = null, Exception $previous = null ) {
+	public function __construct( $repositoryName, $message = null, ?Exception $previous = null ) {
 		$this->repositoryName = $repositoryName;
 
 		parent::__construct(

diff --git a/lib/packages/wikibase/data-model-services/src/Lookup/UnresolvedEntityRedirectException.php b/lib/packages/wikibase/data-model-services/src/Lookup/UnresolvedEntityRedirectException.php
@@ -31,7 +31,7 @@ public function __construct(
 		EntityId $entityId,
 		EntityId $redirectTargetId,
 		$message = null,
-		Exception $previous = null
+		?Exception $previous = null
 	) {
 		$defaultMessage = 'Unresolved redirect from ' . $entityId->getSerialization() . ' to '
 			. $redirectTargetId->getSerialization();

diff --git a/lib/packages/wikibase/data-model-services/tests/fixtures/FakeEntityDocument.php b/lib/packages/wikibase/data-model-services/tests/fixtures/FakeEntityDocument.php
@@ -16,7 +16,7 @@ class FakeEntityDocument implements EntityDocument {
 	 */
 	private $id;
 
-	public function __construct( EntityId $id = null ) {
+	public function __construct( ?EntityId $id = null ) {
 		$this->id = $id;
 	}
 

diff --git a/lib/packages/wikibase/data-model/src/Entity/Item.php b/lib/packages/wikibase/data-model/src/Entity/Item.php
@@ -60,17 +60,12 @@ class Item implements
 
 	/**
 	 * @since 1.0
-	 *
-	 * @param ItemId|null $id
-	 * @param Fingerprint|null $fingerprint
-	 * @param SiteLinkList|null $siteLinks
-	 * @param StatementList|null $statements
 	 */
 	public function __construct(
-		ItemId $id = null,
-		Fingerprint $fingerprint = null,
-		SiteLinkList $siteLinks = null,
-		StatementList $statements = null
+		?ItemId $id = null,
+		?Fingerprint $fingerprint = null,
+		?SiteLinkList $siteLinks = null,
+		?StatementList $statements = null
 	) {
 		$this->id = $id;
 		$this->fingerprint = $fingerprint ?: new Fingerprint();

diff --git a/lib/packages/wikibase/data-model/src/Entity/Property.php b/lib/packages/wikibase/data-model/src/Entity/Property.php
@@ -68,7 +68,7 @@ public function __construct(
 		?PropertyId $id,
 		?Fingerprint $fingerprint,
 		$dataTypeId,
-		StatementList $statements = null
+		?StatementList $statements = null
 	) {
 		$this->id = $id;
 		$this->fingerprint = $fingerprint ?: new Fingerprint();

diff --git a/lib/packages/wikibase/data-model/src/Statement/Statement.php b/lib/packages/wikibase/data-model/src/Statement/Statement.php
@@ -59,17 +59,12 @@ class Statement implements PropertyIdProvider {
 
 	/**
 	 * @since 2.0
-	 *
-	 * @param Snak $mainSnak
-	 * @param SnakList|null $qualifiers
-	 * @param ReferenceList|null $references
-	 * @param string|null $guid
 	 */
 	public function __construct(
 		Snak $mainSnak,
-		SnakList $qualifiers = null,
-		ReferenceList $references = null,
-		string $guid = null
+		?SnakList $qualifiers = null,
+		?ReferenceList $references = null,
+		?string $guid = null
 	) {
 		$this->mainSnak = $mainSnak;
 		$this->qualifiers = $qualifiers ?: new SnakList();

diff --git a/lib/packages/wikibase/data-model/src/Statement/StatementGuid.php b/lib/packages/wikibase/data-model/src/Statement/StatementGuid.php
@@ -32,7 +32,7 @@ class StatementGuid {
 	 * @param string|null $originalStatementId the original, non-normalized, statement id.
 	 * Defaults to `null` for compatability.
 	 */
-	public function __construct( EntityId $entityId, string $guidPart, string $originalStatementId = null ) {
+	public function __construct( EntityId $entityId, string $guidPart, ?string $originalStatementId = null ) {
 		$constructedStatementId = $entityId->getSerialization() . self::SEPARATOR . $guidPart;
 		if ( $originalStatementId !== null
 			 && strtolower( $originalStatementId ) !== strtolower( $constructedStatementId ) ) {

diff --git a/lib/packages/wikibase/data-model/src/Statement/StatementList.php b/lib/packages/wikibase/data-model/src/Statement/StatementList.php
@@ -70,7 +70,7 @@ public function getPropertyIds(): array {
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function addStatement( Statement $statement, int $index = null ): void {
+	public function addStatement( Statement $statement, ?int $index = null ): void {
 		if ( $index === null ) {
 			$this->statements[] = $statement;
 		} elseif ( $index >= 0 ) {
@@ -87,7 +87,7 @@ public function addStatement( Statement $statement, int $index = null ): void {
 	 * @param string|null $guid
 	 */
 	public function addNewStatement(
-		Snak $mainSnak, $qualifiers = null, $references = null, string $guid = null
+		Snak $mainSnak, $qualifiers = null, $references = null, ?string $guid = null
 	): void {
 		$qualifiers = is_array( $qualifiers ) ? new SnakList( $qualifiers ) : $qualifiers;
 		$references = is_array( $references ) ? new ReferenceList( $references ) : $references;

diff --git a/lib/packages/wikibase/data-model/src/Term/Fingerprint.php b/lib/packages/wikibase/data-model/src/Term/Fingerprint.php
@@ -42,15 +42,10 @@ public static function newEmpty() {
 	 */
 	private $aliasGroups;
 
-	/**
-	 * @param TermList|null $labels
-	 * @param TermList|null $descriptions
-	 * @param AliasGroupList|null $aliasGroups
-	 */
 	public function __construct(
-		TermList $labels = null,
-		TermList $descriptions = null,
-		AliasGroupList $aliasGroups = null
+		?TermList $labels = null,
+		?TermList $descriptions = null,
+		?AliasGroupList $aliasGroups = null
 	) {
 		$this->labels = $labels ?: new TermList();
 		$this->descriptions = $descriptions ?: new TermList();

diff --git a/lib/packages/wikibase/internal-serialization/src/DeserializerFactory.php b/lib/packages/wikibase/internal-serialization/src/DeserializerFactory.php
@@ -52,7 +52,7 @@ public function __construct(
 		Deserializer $dataValueDeserializer,
 		EntityIdParser $idParser,
 		CurrentDeserializerFactory $currentFactory,
-		DispatchableDeserializer $currentEntityDeserializer = null
+		?DispatchableDeserializer $currentEntityDeserializer = null
 	) {
 		$this->legacyFactory = new LegacyDeserializerFactory( $dataValueDeserializer, $idParser );
 		$this->currentFactory = $currentFactory;
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,6 @@ @@
     	</rule>
     	<rule ref="MediaWiki.Usage.NullableType.ExplicitNullableTypes">
-    		<exclude-pattern>lib/packages/</exclude-pattern>
     		<exclude-pattern>repo/</exclude-pattern>
     	</rule>
@@ Expand Down @@