refactor: rector run

vincentauger · vincentauger · commit 06517974a55b · 2025-11-05T13:23:14.000-04:00
diff --git a/rector.php b/rector.php
@@ -23,6 +23,5 @@
         typeDeclarations: true,
         privatization: true,
         earlyReturn: true,
-        strictBooleans: true,
     )
     ->withPhpSets();
diff --git a/src/Data/DOIActivitiesData.php b/src/Data/DOIActivitiesData.php
@@ -39,7 +39,7 @@ public static function fromArray(array $data): self
 
         return new self(
             data: array_map(
-                fn (array $item): ActivityData => ActivityData::fromArray($item),
+                ActivityData::fromArray(...),
                 $activitiesData
             ),
             meta: ActivityMeta::fromArray($metaData),
diff --git a/src/Data/DOIData.php b/src/Data/DOIData.php
@@ -206,15 +206,15 @@ public static function fromArray(array $data): self
 
         $creators = array_values(array_filter(
             array_map(
-                fn (array $item): ?Creator => Creator::fromArray($item),
+                Creator::fromArray(...),
                 $creatorsData
             ),
             fn (?Creator $creator): bool => $creator instanceof \VincentAuger\DataCiteSdk\Data\Metadata\Creator
         ));
         assert($creators !== [], 'At least one creator is required');
 
         $titles = array_map(
-            fn (array $item): Title => Title::fromArray($item),
+            Title::fromArray(...),
             $titlesData
         );
         assert($titles !== [], 'At least one title is required');
@@ -226,11 +226,11 @@ public static function fromArray(array $data): self
             prefix: $attributes['prefix'] ?? null,
             suffix: $attributes['suffix'] ?? null,
             identifiers: array_map(
-                fn (array $item): Identifier => Identifier::fromArray($item),
+                Identifier::fromArray(...),
                 $identifiersData
             ),
             alternateIdentifiers: array_map(
-                fn (array $item): AlternateIdentifier => AlternateIdentifier::fromArray($item),
+                AlternateIdentifier::fromArray(...),
                 $alternateIdentifiersData
             ),
             creators: $creators,
@@ -239,50 +239,50 @@ public static function fromArray(array $data): self
             container: ContainerData::fromArray($containerData),
             publicationYear: (int) $attributes['publicationYear'],
             subjects: array_map(
-                fn (array $item): Subject => Subject::fromArray($item),
+                Subject::fromArray(...),
                 $subjectsData
             ),
             contributors: array_values(array_filter(
                 array_map(
-                    fn (array $item): ?Contributor => Contributor::fromArray($item),
+                    Contributor::fromArray(...),
                     $contributorsData
                 ),
                 fn (?Contributor $contributor): bool => $contributor instanceof \VincentAuger\DataCiteSdk\Data\Metadata\Contributor
             )),
             dates: array_map(
-                fn (array $item): Date => Date::fromArray($item),
+                Date::fromArray(...),
                 $datesData
             ),
             language: isset($attributes['language']) && is_string($attributes['language']) ? $attributes['language'] : null,
             types: ResourceType::fromArray($typesData),
             relatedIdentifiers: array_map(
-                fn (array $item): RelatedIdentifier => RelatedIdentifier::fromArray($item),
+                RelatedIdentifier::fromArray(...),
                 $relatedIdentifiersData
             ),
             relatedItems: array_map(
-                fn (array $item): RelatedItem => RelatedItem::fromArray($item),
+                RelatedItem::fromArray(...),
                 $relatedItemsData
             ),
             sizes: $sizesData,
             formats: $formatsData,
             version: isset($attributes['version']) && is_string($attributes['version']) ? $attributes['version'] : null,
             rightsList: array_map(
-                fn (array $item): RightsList => RightsList::fromArray($item),
+                RightsList::fromArray(...),
                 $rightsListData
             ),
             descriptions: array_values(array_filter(
                 array_map(
-                    fn (array $item): ?Description => Description::fromArray($item),
+                    Description::fromArray(...),
                     $descriptionsData
                 ),
                 fn (?Description $description): bool => $description instanceof \VincentAuger\DataCiteSdk\Data\Metadata\Description
             )),
             geoLocations: array_map(
-                fn (array $item): GeoLocation => GeoLocation::fromArray($item),
+                GeoLocation::fromArray(...),
                 $geoLocationsData
             ),
             fundingReferences: array_map(
-                fn (array $item): FundingReference => FundingReference::fromArray($item),
+                FundingReference::fromArray(...),
                 $fundingReferencesData
             ),
             xml: $attributes['xml'] ?? null,
diff --git a/src/Data/EventMeta.php b/src/Data/EventMeta.php
@@ -58,27 +58,27 @@ public static function fromArray(array $data): self
             totalPages: (int) $data['total-pages'],
             page: (int) $data['page'],
             sources: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $sourcesData
             ),
             occurred: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $occurredData
             ),
             prefixes: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $prefixesData
             ),
             citationTypes: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $citationTypesData
             ),
             relationTypes: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $relationTypesData
             ),
             registrants: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $registrantsData
             ),
         );
diff --git a/src/Data/GeoLocation/GeoLocation.php b/src/Data/GeoLocation/GeoLocation.php
@@ -40,7 +40,7 @@ public static function fromArray(array $data): self
             /** @var array<array<string, mixed>> $polygonArray */
             $polygonArray = $data['geoLocationPolygon'];
             $geoLocationPolygonData = array_map(
-                fn (array $item): GeoLocationPolygon => GeoLocationPolygon::fromArray($item),
+                GeoLocationPolygon::fromArray(...),
                 $polygonArray
             );
         }
diff --git a/src/Data/Identifiers/RelatedItem.php b/src/Data/Identifiers/RelatedItem.php
@@ -65,7 +65,7 @@ public static function fromArray(array $data): self
             /** @var array<array<string, mixed>> $creatorsArray */
             $creatorsArray = $data['creators'];
             $creatorsData = array_map(
-                fn (array $item): RelatedItemCreator => RelatedItemCreator::fromArray($item),
+                RelatedItemCreator::fromArray(...),
                 $creatorsArray
             );
         }
@@ -75,14 +75,14 @@ public static function fromArray(array $data): self
             /** @var array<array<string, mixed>> $contributorsArray */
             $contributorsArray = $data['contributors'];
             $contributorsData = array_map(
-                fn (array $item): RelatedItemContributor => RelatedItemContributor::fromArray($item),
+                RelatedItemContributor::fromArray(...),
                 $contributorsArray
             );
         }
 
         return new self(
             titles: array_map(
-                fn (array $item): Title => Title::fromArray($item),
+                Title::fromArray(...),
                 $titlesData
             ),
             relationType: $data['relationType'] instanceof RelationType ? $data['relationType'] : RelationType::from($data['relationType']),
diff --git a/src/Data/ListDOIData.php b/src/Data/ListDOIData.php
@@ -39,7 +39,7 @@ public static function fromArray(array $data): self
 
         return new self(
             data: array_map(
-                fn (array $item): DOIData => DOIData::fromArray($item),
+                DOIData::fromArray(...),
                 $doisData
             ),
             meta: ListMeta::fromArray($metaData),
diff --git a/src/Data/ListEventData.php b/src/Data/ListEventData.php
@@ -38,7 +38,7 @@ public static function fromArray(array $data): self
 
         return new self(
             data: array_map(
-                fn (array $item): EventData => EventData::fromArray($item),
+                EventData::fromArray(...),
                 $eventsData
             ),
             meta: EventMeta::fromArray($metaData),
diff --git a/src/Data/ListMeta.php b/src/Data/ListMeta.php
@@ -119,75 +119,75 @@ public static function fromArray(array $data): self
             totalPages: (int) $data['totalPages'],
             page: (int) $data['page'],
             states: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $statesData
             ),
             resourceTypes: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $resourceTypesData
             ),
             created: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $createdData
             ),
             published: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $publishedData
             ),
             registered: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $registeredData
             ),
             providers: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $providersData
             ),
             clients: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $clientsData
             ),
             affiliations: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $affiliationsData
             ),
             prefixes: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $prefixesData
             ),
             certificates: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $certificatesData
             ),
             licenses: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $licensesData
             ),
             schemaVersions: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $schemaVersionsData
             ),
             linkChecksStatus: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $linkChecksStatusData
             ),
             subjects: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $subjectsData
             ),
             fieldsOfScience: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $fieldsOfScienceData
             ),
             citations: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $citationsData
             ),
             views: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $viewsData
             ),
             downloads: array_map(
-                fn (array $item): MetaItem => MetaItem::fromArray($item),
+                MetaItem::fromArray(...),
                 $downloadsData
             ),
         );
diff --git a/src/Data/Metadata/Contributor.php b/src/Data/Metadata/Contributor.php
@@ -77,7 +77,7 @@ function (mixed $item): Affiliation {
             familyName: isset($data['familyName']) && is_string($data['familyName']) ? $data['familyName'] : null,
             affiliation: $affiliations,
             nameIdentifiers: array_map(
-                fn (array $item): NameIdentifier => NameIdentifier::fromArray($item),
+                NameIdentifier::fromArray(...),
                 $nameIdentifiersData
             ),
         );
diff --git a/src/Data/Metadata/Creator.php b/src/Data/Metadata/Creator.php
@@ -65,7 +65,7 @@ function (mixed $item): Affiliation {
             familyName: isset($data['familyName']) && is_string($data['familyName']) ? $data['familyName'] : null,
             affiliation: $affiliations,
             nameIdentifiers: array_map(
-                fn (array $item): NameIdentifier => NameIdentifier::fromArray($item),
+                NameIdentifier::fromArray(...),
                 $nameIdentifiersData
             ),
         );
diff --git a/src/Data/Relationships/RelationshipData.php b/src/Data/Relationships/RelationshipData.php
@@ -68,27 +68,27 @@ public static function fromArray(array $data): self
             provider: $providerData ? RelationshipProvider::fromArray($providerData) : null,
             media: $mediaData ? RelationshipMedia::fromArray($mediaData) : null,
             references: array_map(
-                fn (array $item): \VincentAuger\DataCiteSdk\Data\Relationships\RelationshipItem => RelationshipItem::fromArray($item),
+                RelationshipItem::fromArray(...),
                 $referencesData
             ),
             citations: array_map(
-                fn (array $item): \VincentAuger\DataCiteSdk\Data\Relationships\RelationshipItem => RelationshipItem::fromArray($item),
+                RelationshipItem::fromArray(...),
                 $citationsData
             ),
             parts: array_map(
-                fn (array $item): \VincentAuger\DataCiteSdk\Data\Relationships\RelationshipItem => RelationshipItem::fromArray($item),
+                RelationshipItem::fromArray(...),
                 $partsData
             ),
             partOf: array_map(
-                fn (array $item): \VincentAuger\DataCiteSdk\Data\Relationships\RelationshipItem => RelationshipItem::fromArray($item),
+                RelationshipItem::fromArray(...),
                 $partOfData
             ),
             versions: array_map(
-                fn (array $item): \VincentAuger\DataCiteSdk\Data\Relationships\RelationshipItem => RelationshipItem::fromArray($item),
+                RelationshipItem::fromArray(...),
                 $versionsData
             ),
             versionOf: array_map(
-                fn (array $item): \VincentAuger\DataCiteSdk\Data\Relationships\RelationshipItem => RelationshipItem::fromArray($item),
+                RelationshipItem::fromArray(...),
                 $versionOfData
             ),
         );
diff --git a/tests/Data/ValidationTest.php b/tests/Data/ValidationTest.php
@@ -185,7 +185,6 @@
         $funding = new FundingReference(
             funderName: 'European Commission',
             funderIdentifier: 'https://doi.org/10.13039/501100000780',
-            funderIdentifierType: null,
         );
 
         expect(fn (): array => $funding->toArray())
@@ -224,8 +223,6 @@
     test('succeeds when neither funderIdentifier nor funderIdentifierType are provided', function (): void {
         $funding = new FundingReference(
             funderName: 'European Commission',
-            funderIdentifier: null,
-            funderIdentifierType: null,
         );
 
         $array = $funding->toArray();

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,5 @@`
`23`	`23`	`typeDeclarations: true,`
`24`	`24`	`privatization: true,`
`25`	`25`	`earlyReturn: true,`
`26`		`- strictBooleans: true,`
`27`	`26`	`)`
`28`	`27`	`->withPhpSets();`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public static function fromArray(array $data): self`
`40`	`40`	`/** @var array<array<string, mixed>> $polygonArray */`
`41`	`41`	`$polygonArray = $data['geoLocationPolygon'];`
`42`	`42`	`$geoLocationPolygonData = array_map(`
`43`		`- fn (array $item): GeoLocationPolygon => GeoLocationPolygon::fromArray($item),`
	`43`	`+ GeoLocationPolygon::fromArray(...),`
`44`	`44`	`$polygonArray`
`45`	`45`	`);`
`46`	`46`	`}`