CodeStyle

1 files changed, 6 insertions, 56 deletions

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 876df8743f..740e240182 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -36,7 +36,12 @@ parameters:
 			path: app/Cli/Commands/TreeCreate.php
 
 		-
-			message: "#^Method Fisharebest\\\\Webtrees\\\\Cli\\\\Commands\\\\TreeExport\\:\\:autoCompleteTreeName\\(\\) return type has no value type specified in iterable type array\\.$#"
+			message: "#^Method Fisharebest\\\\Webtrees\\\\Cli\\\\Commands\\\\TreeExport\\:\\:autoCompleteTreeName\\(\\) should return array\\<string\\> but returns array\\.$#"
+			count: 1
+			path: app/Cli/Commands/TreeExport.php
+
+		-
+			message: "#^Unknown parameter \\$suggestedValues in call to method Symfony\\\\Component\\\\Console\\\\Command\\\\Command\\:\\:addArgument\\(\\)\\.$#"
 			count: 1
 			path: app/Cli/Commands/TreeExport.php
 
@@ -571,11 +576,6 @@ parameters:
 			path: app/Http/RequestHandlers/AutoCompleteCitation.php
 
 		-
-			message: "#^Parameter \\#1 \\$items of method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),Fisharebest\\\\Webtrees\\\\Individual\\>\\:\\:merge\\(\\) expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<\\(int\\|string\\), Fisharebest\\\\Webtrees\\\\Individual\\>\\|iterable\\<\\(int\\|string\\), Fisharebest\\\\Webtrees\\\\Individual\\>, Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\), Fisharebest\\\\Webtrees\\\\Family\\> given\\.$#"
-			count: 1
-			path: app/Http/RequestHandlers/AutoCompleteCitation.php
-
-		-
 			message: "#^Cannot call method fullName\\(\\) on Fisharebest\\\\Webtrees\\\\GedcomRecord\\|null\\.$#"
 			count: 1
 			path: app/Http/RequestHandlers/CalendarEvents.php
@@ -2166,11 +2166,6 @@ parameters:
 			path: app/Module/HtmlBlockModule.php
 
 		-
-			message: "#^Parameter \\#1 \\$items of method Illuminate\\\\Support\\\\Collection\\<int,string\\>\\:\\:merge\\(\\) expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<int, string\\>\\|iterable\\<int, string\\>, Illuminate\\\\Support\\\\Collection\\<int, mixed\\> given\\.$#"
-			count: 2
-			path: app/Module/IndividualFactsTabModule.php
-
-		-
 			message: "#^Cannot call method xref\\(\\) on Fisharebest\\\\Webtrees\\\\Family\\|null\\.$#"
 			count: 1
 			path: app/Module/InteractiveTree/TreeView.php
@@ -2701,11 +2696,6 @@ parameters:
 			path: app/Module/RecentChangesModule.php
 
 		-
-			message: "#^Parameter \\#1 \\$items of method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),Fisharebest\\\\Webtrees\\\\Individual\\>\\:\\:merge\\(\\) expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<\\(int\\|string\\), Fisharebest\\\\Webtrees\\\\Individual\\>\\|iterable\\<\\(int\\|string\\), Fisharebest\\\\Webtrees\\\\Individual\\>, Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\), Fisharebest\\\\Webtrees\\\\Family\\> given\\.$#"
-			count: 1
-			path: app/Module/RecentChangesModule.php
-
-		-
 			message: "#^Cannot call method getMap\\(\\) on mixed\\.$#"
 			count: 1
 			path: app/Module/RedirectLegacyUrlsModule.php
@@ -2786,11 +2776,6 @@ parameters:
 			path: app/Module/ResearchTaskModule.php
 
 		-
-			message: "#^Parameter \\#1 \\$items of method Illuminate\\\\Support\\\\Collection\\<int,Fisharebest\\\\Webtrees\\\\Individual\\>\\:\\:merge\\(\\) expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<int, Fisharebest\\\\Webtrees\\\\Individual\\>\\|iterable\\<int, Fisharebest\\\\Webtrees\\\\Individual\\>, Illuminate\\\\Support\\\\Collection\\<int, Fisharebest\\\\Webtrees\\\\Family\\> given\\.$#"
-			count: 1
-			path: app/Module/ResearchTaskModule.php
-
-		-
 			message: "#^Cannot access property \\$new_gedcom on mixed\\.$#"
 			count: 1
 			path: app/Module/ReviewChangesModule.php
@@ -2831,11 +2816,6 @@ parameters:
 			path: app/Module/ShareAnniversaryModule.php
 
 		-
-			message: "#^Parameter \\#1 \\$items of method Illuminate\\\\Support\\\\Collection\\<int,Fisharebest\\\\Webtrees\\\\Fact\\>\\:\\:merge\\(\\) expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<int, Fisharebest\\\\Webtrees\\\\Fact\\>\\|iterable\\<int, Fisharebest\\\\Webtrees\\\\Fact\\>, Illuminate\\\\Support\\\\Collection\\<int, Illuminate\\\\Support\\\\Collection\\<int, Fisharebest\\\\Webtrees\\\\Fact\\>\\> given\\.$#"
-			count: 1
-			path: app/Module/ShareAnniversaryModule.php
-
-		-
 			message: "#^Parameter \\#1 \\$callback of method Illuminate\\\\Support\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:map\\(\\) expects callable\\(mixed, int\\|string\\)\\: Fisharebest\\\\Webtrees\\\\Family, Closure\\(object\\)\\: Fisharebest\\\\Webtrees\\\\Family given\\.$#"
 			count: 1
 			path: app/Module/SiteMapModule.php
@@ -3791,16 +3771,6 @@ parameters:
 			path: app/Services/CalendarService.php
 
 		-
-			message: "#^Method Fisharebest\\\\Webtrees\\\\Services\\\\ChartService\\:\\:descendants\\(\\) should return Illuminate\\\\Support\\\\Collection\\<int, Fisharebest\\\\Webtrees\\\\Individual\\> but returns Illuminate\\\\Support\\\\Collection\\<string, Fisharebest\\\\Webtrees\\\\Individual\\>\\.$#"
-			count: 1
-			path: app/Services/ChartService.php
-
-		-
-			message: "#^Parameter \\#1 \\$items of method Illuminate\\\\Support\\\\Collection\\<string,Fisharebest\\\\Webtrees\\\\Individual\\>\\:\\:merge\\(\\) expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<string, Fisharebest\\\\Webtrees\\\\Individual\\>\\|iterable\\<string, Fisharebest\\\\Webtrees\\\\Individual\\>, Illuminate\\\\Support\\\\Collection\\<int, Fisharebest\\\\Webtrees\\\\Individual\\> given\\.$#"
-			count: 1
-			path: app/Services/ChartService.php
-
-		-
 			message: "#^Cannot access offset string on mixed\\.$#"
 			count: 2
 			path: app/Services/ClipboardService.php
@@ -4021,16 +3991,6 @@ parameters:
 			path: app/Services/IndividualFactsService.php
 
 		-
-			message: "#^Parameter \\#1 \\$items of method Illuminate\\\\Support\\\\Collection\\<int,Fisharebest\\\\Webtrees\\\\Fact\\>\\:\\:merge\\(\\) expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<int, Fisharebest\\\\Webtrees\\\\Fact\\>\\|iterable\\<int, Fisharebest\\\\Webtrees\\\\Fact\\>, Illuminate\\\\Support\\\\Collection\\<int, mixed\\> given\\.$#"
-			count: 2
-			path: app/Services/IndividualFactsService.php
-
-		-
-			message: "#^Parameter \\#1 \\$items of method Illuminate\\\\Support\\\\Collection\\<int,Fisharebest\\\\Webtrees\\\\Individual\\>\\:\\:merge\\(\\) expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<int, Fisharebest\\\\Webtrees\\\\Individual\\>\\|iterable\\<int, Fisharebest\\\\Webtrees\\\\Individual\\>, Illuminate\\\\Support\\\\Collection\\<int, Fisharebest\\\\Webtrees\\\\Family\\> given\\.$#"
-			count: 2
-			path: app/Services/IndividualFactsService.php
-
-		-
 			message: "#^Parameter \\#2 \\$spouse of method Fisharebest\\\\Webtrees\\\\Services\\\\IndividualFactsService\\:\\:spouseFacts\\(\\) expects Fisharebest\\\\Webtrees\\\\Individual, Fisharebest\\\\Webtrees\\\\Individual\\|null given\\.$#"
 			count: 1
 			path: app/Services/IndividualFactsService.php
@@ -6166,16 +6126,6 @@ parameters:
 			path: tests/app/Http/RequestHandlers/ManageMediaDataTest.php
 
 		-
-			message: "#^Parameter \\#1 \\$items of class Illuminate\\\\Support\\\\Collection constructor expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<TKey of \\(int\\|string\\), TValue\\>\\|iterable\\<TKey of \\(int\\|string\\), TValue\\>\\|null, 'error' given\\.$#"
-			count: 1
-			path: tests/app/Http/RequestHandlers/PingTest.php
-
-		-
-			message: "#^Parameter \\#1 \\$items of class Illuminate\\\\Support\\\\Collection constructor expects Illuminate\\\\Contracts\\\\Support\\\\Arrayable\\<TKey of \\(int\\|string\\), TValue\\>\\|iterable\\<TKey of \\(int\\|string\\), TValue\\>\\|null, 'warning' given\\.$#"
-			count: 1
-			path: tests/app/Http/RequestHandlers/PingTest.php
-
-		-
 			message: "#^Parameter \\#2 \\$query of static method Fisharebest\\\\Webtrees\\\\TestCase\\:\\:createRequest\\(\\) expects array\\<string\\>, array\\<string, array\\<int, string\\>\\|string\\> given\\.$#"
 			count: 3
 			path: tests/app/Http/RequestHandlers/RedirectTimeLinePhpTest.php