summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Factories/ImageFactory.php4
-rw-r--r--phpstan-baseline.neon226
-rw-r--r--phpstan.neon.dist2
3 files changed, 85 insertions, 147 deletions
diff --git a/app/Factories/ImageFactory.php b/app/Factories/ImageFactory.php
index 5dda4f8b6b..a09e9259b9 100644
--- a/app/Factories/ImageFactory.php
+++ b/app/Factories/ImageFactory.php
@@ -138,7 +138,7 @@ class ImageFactory implements ImageFactoryInterface
return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND);
} catch (Throwable $ex) {
return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR)
- ->withHeader('X-Thumbnail-Exception', basename(get_class($ex)) . ': ' . $ex->getMessage());
+ ->withHeader('X-Thumbnail-Exception', get_class($ex) . ': ' . $ex->getMessage());
}
}
@@ -250,7 +250,7 @@ class ImageFactory implements ImageFactoryInterface
return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_NOT_FOUND);
} catch (Throwable $ex) {
return $this->replacementImageResponse((string) StatusCodeInterface::STATUS_INTERNAL_SERVER_ERROR)
- ->withHeader('X-Thumbnail-Exception', basename(get_class($ex)) . ': ' . $ex->getMessage());
+ ->withHeader('X-Thumbnail-Exception', get_class($ex) . ': ' . $ex->getMessage());
}
}
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 0f0a3b548f..0ffe4b09c7 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -41,21 +41,6 @@ parameters:
path: app/Fact.php
-
- message: "#^Parameter \\#1 \\$string of function strlen expects string, string\\|false given\\.$#"
- count: 1
- path: app/Factories/ImageFactory.php
-
- -
- message: "#^Parameter \\#3 \\$headers of function response expects array\\<string\\>, array\\<string, string\\|false\\> given\\.$#"
- count: 1
- path: app/Factories/ImageFactory.php
-
- -
- message: "#^Parameter \\#2 \\$mime_type of method Fisharebest\\\\Webtrees\\\\Factories\\\\ImageFactory\\:\\:imageResponse\\(\\) expects string, string\\|false given\\.$#"
- count: 1
- path: app/Factories/ImageFactory.php
-
- -
message: "#^Parameter \\#1 \\$commonMark of method League\\\\CommonMark\\\\Converter\\:\\:convertToHtml\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: app/Filter.php
@@ -81,11 +66,6 @@ parameters:
path: app/Functions/Functions.php
-
- message: "#^Argument of an invalid type array\\<int, string\\>\\|false supplied for foreach, only iterables are supported\\.$#"
- count: 1
- path: app/Functions/FunctionsExport.php
-
- -
message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, string\\|null given\\.$#"
count: 1
path: app/Functions/FunctionsImport.php
@@ -101,7 +81,7 @@ parameters:
path: app/Functions/FunctionsImport.php
-
- message: "#^Parameter \\#2 \\$start of function substr expects int, int\\<0, max\\>\\|false given\\.$#"
+ message: "#^Parameter \\#2 \\$offset of function substr expects int, int\\<0, max\\>\\|false given\\.$#"
count: 1
path: app/Functions/FunctionsPrint.php
@@ -111,12 +91,12 @@ parameters:
path: app/Functions/FunctionsPrint.php
-
- message: "#^Parameter \\#2 \\.\\.\\.\\$args of function array_merge expects array, array\\<int, string\\>\\|false given\\.$#"
+ message: "#^Parameter \\#2 \\.\\.\\.\\$arrays of function array_merge expects array, array\\<int, string\\>\\|false given\\.$#"
count: 1
path: app/Functions/FunctionsPrint.php
-
- message: "#^Parameter \\#1 \\$arr1 of function array_intersect expects array, array\\<int, string\\>\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$array of function array_intersect expects array, array\\<int, string\\>\\|false given\\.$#"
count: 1
path: app/Functions/FunctionsPrint.php
@@ -131,7 +111,7 @@ parameters:
path: app/Functions/FunctionsPrintFacts.php
-
- message: "#^Parameter \\#2 \\$start of function substr expects int, int\\<0, max\\>\\|false given\\.$#"
+ message: "#^Parameter \\#2 \\$offset of function substr expects int, int\\<0, max\\>\\|false given\\.$#"
count: 1
path: app/Functions/FunctionsPrintFacts.php
@@ -180,12 +160,12 @@ parameters:
path: app/Functions/FunctionsRtl.php
-
- message: "#^Parameter \\#3 \\$length of function substr expects int, int\\<0, max\\>\\|false given\\.$#"
+ message: "#^Parameter \\#3 \\$length of function substr expects int\\|null, int\\<0, max\\>\\|false given\\.$#"
count: 2
path: app/Functions/FunctionsRtl.php
-
- message: "#^Parameter \\#2 \\$start of function substr expects int, int\\<0, max\\>\\|false given\\.$#"
+ message: "#^Parameter \\#2 \\$offset of function substr expects int, int\\<0, max\\>\\|false given\\.$#"
count: 2
path: app/Functions/FunctionsRtl.php
@@ -200,7 +180,7 @@ parameters:
path: app/GedcomRecord.php
-
- message: "#^Parameter \\#1 \\$str of function trim expects string, string\\|null given\\.$#"
+ message: "#^Parameter \\#1 \\$string of function trim expects string, string\\|null given\\.$#"
count: 3
path: app/GedcomRecord.php
@@ -225,7 +205,7 @@ parameters:
path: app/GedcomRecord.php
-
- message: "#^Parameter \\#1 \\$stack of function array_shift expects array, array\\<int, string\\>\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$array of function array_shift expects array, array\\<int, string\\>\\|false given\\.$#"
count: 3
path: app/GedcomRecord.php
@@ -270,6 +250,11 @@ parameters:
path: app/Http/Middleware/BaseUrl.php
-
+ message: "#^Caught class League\\\\Flysystem\\\\NotSupportedException not found\\.$#"
+ count: 1
+ path: app/Http/Middleware/HandleExceptions.php
+
+ -
message: "#^Parameter \\#1 \\$message of static method Fisharebest\\\\Webtrees\\\\Log\\:\\:addErrorLog\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: app/Http/Middleware/HandleExceptions.php
@@ -300,7 +285,7 @@ parameters:
path: app/Http/Middleware/UseTransaction.php
-
- message: "#^Parameter \\#1 \\$function of function call_user_func expects callable\\(\\)\\: mixed, array\\(mixed, string\\) given\\.$#"
+ message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, array\\(mixed, string\\) given\\.$#"
count: 1
path: app/Http/Middleware/WrapHandler.php
@@ -330,11 +315,6 @@ parameters:
path: app/Http/RequestHandlers/DataFixSelect.php
-
- message: "#^Cannot access offset 'type' on array\\|false\\.$#"
- count: 1
- path: app/Http/RequestHandlers/DeletePath.php
-
- -
message: "#^Left side of && is always true\\.$#"
count: 1
path: app/Http/RequestHandlers/DeleteRecord.php
@@ -355,17 +335,12 @@ parameters:
path: app/Http/RequestHandlers/EditNoteAction.php
-
- message: "#^Parameter \\#1 \\$str of function trim expects string, string\\|null given\\.$#"
+ message: "#^Parameter \\#1 \\$string of function trim expects string, string\\|null given\\.$#"
count: 1
path: app/Http/RequestHandlers/EditRawRecordAction.php
-
- message: "#^Parameter \\#1 \\$fp of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
- count: 1
- path: app/Http/RequestHandlers/ExportGedcomClient.php
-
- -
- message: "#^Parameter \\#2 \\$resource of method League\\\\Flysystem\\\\Filesystem\\:\\:writeStream\\(\\) expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$stream of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: app/Http/RequestHandlers/ExportGedcomClient.php
@@ -430,11 +405,6 @@ parameters:
path: app/Http/RequestHandlers/ImportGedcomAction.php
-
- message: "#^Parameter \\#1 \\$str of function sha1 expects string, string\\|false given\\.$#"
- count: 1
- path: app/Http/RequestHandlers/ImportThumbnailsAction.php
-
- -
message: "#^Cannot call method tree\\(\\) on Fisharebest\\\\Webtrees\\\\Media\\|null\\.$#"
count: 1
path: app/Http/RequestHandlers/ImportThumbnailsAction.php
@@ -510,32 +480,12 @@ parameters:
path: app/Http/RequestHandlers/MapDataImportAction.php
-
- message: "#^Offset 0 does not exist on array\\|null\\.$#"
- count: 2
- path: app/Http/RequestHandlers/MapDataImportAction.php
-
- -
- message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, array\\|null given\\.$#"
- count: 1
- path: app/Http/RequestHandlers/MapDataImportAction.php
-
- -
- message: "#^Parameter \\#1 \\$input of function array_slice expects array, array\\|null given\\.$#"
- count: 1
- path: app/Http/RequestHandlers/MapDataImportAction.php
-
- -
- message: "#^Offset int does not exist on array\\|null\\.$#"
- count: 2
- path: app/Http/RequestHandlers/MapDataImportAction.php
-
- -
message: "#^Parameter \\#1 \\$gedcom of method Fisharebest\\\\Webtrees\\\\GedcomRecord\\:\\:updateRecord\\(\\) expects string, string\\|null given\\.$#"
count: 1
path: app/Http/RequestHandlers/MergeFactsAction.php
-
- message: "#^Parameter \\#1 \\$function of function call_user_func expects callable\\(\\)\\: mixed, array\\(Fisharebest\\\\Webtrees\\\\Module\\\\ModuleInterface, string\\) given\\.$#"
+ message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, array\\(Fisharebest\\\\Webtrees\\\\Module\\\\ModuleInterface, string\\) given\\.$#"
count: 1
path: app/Http/RequestHandlers/ModuleAction.php
@@ -560,7 +510,7 @@ parameters:
path: app/Http/RequestHandlers/SearchGeneralPage.php
-
- message: "#^Parameter \\#2 \\.\\.\\.\\$args of function array_merge expects array, array\\<int, string\\>\\|false given\\.$#"
+ message: "#^Parameter \\#2 \\.\\.\\.\\$arrays of function array_merge expects array, array\\<int, string\\>\\|false given\\.$#"
count: 1
path: app/Http/RequestHandlers/SearchReplaceAction.php
@@ -585,7 +535,7 @@ parameters:
path: app/Http/RequestHandlers/Select2Place.php
-
- message: "#^Parameter \\#1 \\$value of function e expects Illuminate\\\\Contracts\\\\Support\\\\Htmlable\\|string, string\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$value of function e expects Illuminate\\\\Contracts\\\\Support\\\\DeferringDisplayableValue\\|Illuminate\\\\Contracts\\\\Support\\\\Htmlable\\|string\\|null, string\\|false given\\.$#"
count: 1
path: app/Http/RequestHandlers/SetupWizard.php
@@ -600,9 +550,9 @@ parameters:
path: app/Http/RequestHandlers/SiteLogsData.php
-
- message: "#^Parameter \\#2 \\$resource of method League\\\\Flysystem\\\\FilesystemInterface\\:\\:writeStream\\(\\) expects resource, resource\\|null given\\.$#"
+ message: "#^Cannot cast array\\|string\\|false to int\\.$#"
count: 1
- path: app/Http/RequestHandlers/UploadMediaAction.php
+ path: app/Http/RequestHandlers/SitePreferencesPage.php
-
message: "#^Method Fisharebest\\\\Webtrees\\\\Http\\\\Routes\\\\ApiRoutes\\:\\:load\\(\\) has parameter \\$router with no value type specified in iterable type Aura\\\\Router\\\\Map\\.$#"
@@ -630,7 +580,7 @@ parameters:
path: app/Individual.php
-
- message: "#^Parameter \\#1 \\$numerator of function intdiv expects int, float\\|int given\\.$#"
+ message: "#^Parameter \\#1 \\$num1 of function intdiv expects int, float\\|int given\\.$#"
count: 1
path: app/Individual.php
@@ -695,22 +645,12 @@ parameters:
path: app/Media.php
-
- message: "#^Method Fisharebest\\\\Webtrees\\\\MediaFile\\:\\:fileContents\\(\\) should return string but returns string\\|false\\.$#"
- count: 1
- path: app/MediaFile.php
-
- -
message: "#^Cannot call method updateFact\\(\\) on Fisharebest\\\\Webtrees\\\\Individual\\|null\\.$#"
count: 1
path: app/Module/CensusAssistantModule.php
-
- message: "#^Parameter \\#1 \\$fp of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
- count: 1
- path: app/Module/ClippingsCartModule.php
-
- -
- message: "#^Parameter \\#2 \\$resource of method League\\\\Flysystem\\\\Filesystem\\:\\:writeStream\\(\\) expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$stream of function stream_get_meta_data expects resource, resource\\|false given\\.$#"
count: 1
path: app/Module/ClippingsCartModule.php
@@ -725,22 +665,22 @@ parameters:
path: app/Module/FamilyTreeNewsModule.php
-
- message: "#^Parameter \\#1 \\$im of function imagecolorallocate expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of function imagecolorallocate expects GdImage, GdImage\\|false given\\.$#"
count: 1
path: app/Module/FanChartModule.php
-
- message: "#^Parameter \\#1 \\$im of function imagecolortransparent expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of function imagecolortransparent expects GdImage, GdImage\\|false given\\.$#"
count: 1
path: app/Module/FanChartModule.php
-
- message: "#^Parameter \\#2 \\$col of function imagecolortransparent expects int, int\\|false given\\.$#"
+ message: "#^Parameter \\#2 \\$color of function imagecolortransparent expects int\\|null, int\\|false given\\.$#"
count: 1
path: app/Module/FanChartModule.php
-
- message: "#^Parameter \\#1 \\$image of method Fisharebest\\\\Webtrees\\\\Module\\\\FanChartModule\\:\\:imageColor\\(\\) expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of method Fisharebest\\\\Webtrees\\\\Module\\\\FanChartModule\\:\\:imageColor\\(\\) expects resource, GdImage\\|false given\\.$#"
count: 4
path: app/Module/FanChartModule.php
@@ -750,12 +690,12 @@ parameters:
path: app/Module/FanChartModule.php
-
- message: "#^Parameter \\#1 \\$im of function imagefilledrectangle expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of function imagefilledrectangle expects GdImage, GdImage\\|false given\\.$#"
count: 1
path: app/Module/FanChartModule.php
-
- message: "#^Parameter \\#6 \\$col of function imagefilledrectangle expects int, int\\|false given\\.$#"
+ message: "#^Parameter \\#6 \\$color of function imagefilledrectangle expects int, int\\|false given\\.$#"
count: 1
path: app/Module/FanChartModule.php
@@ -765,22 +705,22 @@ parameters:
path: app/Module/FanChartModule.php
-
- message: "#^Parameter \\#1 \\$im of function imagefilledarc expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of function imagefilledarc expects GdImage, GdImage\\|false given\\.$#"
count: 2
path: app/Module/FanChartModule.php
-
- message: "#^Parameter \\#1 \\$im of function imagettftext expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of function imagettftext expects GdImage, GdImage\\|false given\\.$#"
count: 1
path: app/Module/FanChartModule.php
-
- message: "#^Parameter \\#1 \\$im of function imagepng expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of function imagepng expects GdImage, GdImage\\|false given\\.$#"
count: 1
path: app/Module/FanChartModule.php
-
- message: "#^Parameter \\#1 \\$im of function imagedestroy expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of function imagedestroy expects GdImage, GdImage\\|false given\\.$#"
count: 1
path: app/Module/FanChartModule.php
@@ -790,6 +730,11 @@ parameters:
path: app/Module/FanChartModule.php
-
+ message: "#^Parameter \\#1 \\$image of function imagecolorallocate expects GdImage, resource given\\.$#"
+ count: 1
+ path: app/Module/FanChartModule.php
+
+ -
message: "#^Method Fisharebest\\\\Webtrees\\\\Module\\\\FixDuplicateLinks\\:\\:updateGedcom\\(\\) should return string but returns string\\|null\\.$#"
count: 1
path: app/Module/FixDuplicateLinks.php
@@ -880,7 +825,7 @@ parameters:
path: app/Module/IndividualListModule.php
-
- message: "#^Parameter \\#1 \\$str of function strip_tags expects string, string\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$string of function strip_tags expects string, string\\|false given\\.$#"
count: 1
path: app/Module/IndividualMetadataModule.php
@@ -1330,7 +1275,17 @@ parameters:
path: app/Report/ReportHtmlTextbox.php
-
- message: "#^Parameter \\#1 \\$function of function call_user_func expects callable\\(\\)\\: mixed, array\\(\\$this\\(Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserBase\\), string\\) given\\.$#"
+ message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserBase\\:\\:\\$xml_parser \\(resource\\) does not accept XMLParser\\.$#"
+ count: 1
+ path: app/Report/ReportParserBase.php
+
+ -
+ message: "#^Parameter \\#3 \\$value of function xml_parser_set_option expects int\\|string, false given\\.$#"
+ count: 1
+ path: app/Report/ReportParserBase.php
+
+ -
+ message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, array\\(\\$this\\(Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserBase\\), string\\) given\\.$#"
count: 2
path: app/Report/ReportParserBase.php
@@ -1340,7 +1295,7 @@ parameters:
path: app/Report/ReportParserGenerate.php
-
- message: "#^Parameter \\#1 \\$function of function call_user_func expects callable\\(\\)\\: mixed, array\\(\\$this\\(Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\), string\\) given\\.$#"
+ message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, array\\(\\$this\\(Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\), string\\) given\\.$#"
count: 2
path: app/Report/ReportParserGenerate.php
@@ -1390,22 +1345,37 @@ parameters:
path: app/Report/ReportParserGenerate.php
-
- message: "#^Parameter \\#1 \\$array_arg of function end expects array\\|object, array\\<int, string\\>\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$array of function end expects array, array\\<int, string\\>\\|false given\\.$#"
count: 1
path: app/Report/ReportParserGenerate.php
-
+ message: "#^Parameter \\#1 \\$parser of function xml_get_current_line_number expects XMLParser, resource given\\.$#"
+ count: 6
+ path: app/Report/ReportParserGenerate.php
+
+ -
message: "#^Cannot access offset float\\|int on array\\<int, string\\>\\|false\\.$#"
count: 14
path: app/Report/ReportParserGenerate.php
-
+ message: "#^Property Fisharebest\\\\Webtrees\\\\Report\\\\ReportParserGenerate\\:\\:\\$parser \\(resource\\) does not accept XMLParser\\.$#"
+ count: 4
+ path: app/Report/ReportParserGenerate.php
+
+ -
+ message: "#^Parameter \\#3 \\$value of function xml_parser_set_option expects int\\|string, false given\\.$#"
+ count: 4
+ path: app/Report/ReportParserGenerate.php
+
+ -
message: "#^Cannot call method facts\\(\\) on Fisharebest\\\\Webtrees\\\\GedcomRecord\\|null\\.$#"
count: 2
path: app/Report/ReportParserGenerate.php
-
- message: "#^Parameter \\#1 \\$str of function addslashes expects string, string\\|null given\\.$#"
+ message: "#^Parameter \\#1 \\$string of function addslashes expects string, string\\|null given\\.$#"
count: 1
path: app/Report/ReportParserGenerate.php
@@ -1415,12 +1385,12 @@ parameters:
path: app/Report/ReportParserGenerate.php
-
- message: "#^Parameter \\#1 \\$im of function imagesx expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of function imagesx expects GdImage, GdImage\\|false given\\.$#"
count: 2
path: app/Report/ReportParserGenerate.php
-
- message: "#^Parameter \\#1 \\$im of function imagesy expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$image of function imagesy expects GdImage, GdImage\\|false given\\.$#"
count: 2
path: app/Report/ReportParserGenerate.php
@@ -1565,6 +1535,11 @@ parameters:
path: app/Schema/Migration44.php
-
+ message: "#^Parameter \\#1 \\$table of static method Illuminate\\\\Database\\\\Capsule\\\\Manager\\:\\:table\\(\\) expects Closure\\|Illuminate\\\\Database\\\\Query\\\\Builder\\|string, Illuminate\\\\Database\\\\Query\\\\Expression given\\.$#"
+ count: 2
+ path: app/Services/AdminService.php
+
+ -
message: "#^Anonymous function should return Fisharebest\\\\Webtrees\\\\Source but returns Fisharebest\\\\Webtrees\\\\Source\\|null\\.$#"
count: 1
path: app/Services/AdminService.php
@@ -1585,16 +1560,6 @@ parameters:
path: app/Services/AdminService.php
-
- message: "#^Parameter \\#1 \\$fp of function fread expects resource, resource\\|false given\\.$#"
- count: 1
- path: app/Services/AdminService.php
-
- -
- message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
- count: 1
- path: app/Services/AdminService.php
-
- -
message: "#^Parameter \\#2 \\$subject of function preg_match expects string, string\\|false given\\.$#"
count: 1
path: app/Services/AdminService.php
@@ -1630,11 +1595,6 @@ parameters:
path: app/Services/ClipboardService.php
-
- message: "#^Parameter \\#1 \\$column of method Illuminate\\\\Database\\\\Query\\\\Builder\\:\\:orderBy\\(\\) expects string, Illuminate\\\\Database\\\\Query\\\\Expression\\|string given\\.$#"
- count: 1
- path: app/Services/DatatablesService.php
-
- -
message: "#^Parameter \\#1 \\$hostname of function gethostbyname expects string, string\\|false given\\.$#"
count: 1
path: app/Services/EmailService.php
@@ -1675,11 +1635,6 @@ parameters:
path: app/Services/HomePageService.php
-
- message: "#^Cannot access offset 'type' on array\\|false\\.$#"
- count: 2
- path: app/Services/HousekeepingService.php
-
- -
message: "#^Access to an undefined property object\\:\\:\\$place\\.$#"
count: 1
path: app/Services/MapDataService.php
@@ -1700,12 +1655,7 @@ parameters:
path: app/Services/MediaFileService.php
-
- message: "#^Parameter \\#2 \\$resource of method League\\\\Flysystem\\\\FilesystemInterface\\:\\:putStream\\(\\) expects resource, resource\\|null given\\.$#"
- count: 1
- path: app/Services/MediaFileService.php
-
- -
- message: "#^Parameter \\#1 \\$str of function trim expects string, string\\|null given\\.$#"
+ message: "#^Parameter \\#1 \\$string of function trim expects string, string\\|null given\\.$#"
count: 2
path: app/Services/MediaFileService.php
@@ -1745,12 +1695,12 @@ parameters:
path: app/Services/SearchService.php
-
- message: "#^Parameter \\#2 \\$str of function explode expects string, string\\|false given\\.$#"
+ message: "#^Parameter \\#2 \\$string of function explode expects string, string\\|false given\\.$#"
count: 2
path: app/Services/ServerCheckService.php
-
- message: "#^Parameter \\#1 \\$value of function e expects Illuminate\\\\Contracts\\\\Support\\\\Htmlable\\|string, string\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$value of function e expects Illuminate\\\\Contracts\\\\Support\\\\DeferringDisplayableValue\\|Illuminate\\\\Contracts\\\\Support\\\\Htmlable\\|string\\|null, string\\|false given\\.$#"
count: 1
path: app/Services/ServerCheckService.php
@@ -1760,7 +1710,7 @@ parameters:
path: app/Services/SiteLogsService.php
-
- message: "#^Parameter \\#1 \\$fp of function fwrite expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$stream of function fwrite expects resource, resource\\|false given\\.$#"
count: 1
path: app/Services/UpgradeService.php
@@ -1770,22 +1720,17 @@ parameters:
path: app/Services/UpgradeService.php
-
- message: "#^Parameter \\#1 \\$fp of function ftell expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$stream of function ftell expects resource, resource\\|false given\\.$#"
count: 1
path: app/Services/UpgradeService.php
-
- message: "#^Parameter \\#1 \\$fp of function rewind expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$stream of function rewind expects resource, resource\\|false given\\.$#"
count: 1
path: app/Services/UpgradeService.php
-
- message: "#^Parameter \\#2 \\$resource of method League\\\\Flysystem\\\\FilesystemInterface\\:\\:writeStream\\(\\) expects resource, resource\\|false given\\.$#"
- count: 1
- path: app/Services/UpgradeService.php
-
- -
- message: "#^Parameter \\#1 \\$fp of function fclose expects resource, resource\\|false given\\.$#"
+ message: "#^Parameter \\#1 \\$stream of function fclose expects resource, resource\\|false given\\.$#"
count: 1
path: app/Services/UpgradeService.php
@@ -1795,11 +1740,6 @@ parameters:
path: app/Services/UpgradeService.php
-
- message: "#^Parameter \\#2 \\$contents of method League\\\\Flysystem\\\\FilesystemInterface\\:\\:put\\(\\) expects string, string\\|false given\\.$#"
- count: 1
- path: app/Services/UpgradeService.php
-
- -
message: "#^Property Fisharebest\\\\Webtrees\\\\SessionDatabaseHandler\\:\\:\\$row \\(stdClass\\|null\\) does not accept object\\|null\\.$#"
count: 1
path: app/SessionDatabaseHandler.php
@@ -1815,7 +1755,7 @@ parameters:
path: app/Statistics.php
-
- message: "#^Parameter \\#1 \\$function of function call_user_func expects callable\\(\\)\\: mixed, array\\(\\$this\\(Fisharebest\\\\Webtrees\\\\Statistics\\), string\\) given\\.$#"
+ message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, array\\(\\$this\\(Fisharebest\\\\Webtrees\\\\Statistics\\), string\\) given\\.$#"
count: 2
path: app/Statistics.php
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index 844560a407..a8f010ea45 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -4,7 +4,5 @@ includes:
parameters:
ignoreErrors:
- '#^Call to an undefined method Aura\\Router\\Map::extras\(\)\.$#'
- - '#^Call to an undefined method Illuminate\\Support\\Fluent::references\(\)\.$#'
- '#^Parameter \#1 \$column of method Illuminate\\Database\\Query\\Builder::[a-zA-Z]+\(\) expects string, Illuminate\\Database\\Query\\Expression given\.$#'
- '#^Parameter \#1 \$column of method Illuminate\\Database\\Query\\Builder::[a-zA-Z]+\(\) expects array\|Closure\|string, Illuminate\\Database\\Query\\Expression given\.$#'
- - '#^Parameter \#1 \$table of static method Illuminate\\Database\\Capsule\\Manager::table\(\) expects string, Illuminate\\Database\\Query\\Expression given\.$#'