diff --git a/.phive/phars.xml b/.phive/phars.xml index 812279aa870..2eee12cdd59 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -2,7 +2,7 @@ - + diff --git a/.psalm/baseline.xml b/.psalm/baseline.xml index 79f1e541471..aa5a85b771d 100644 --- a/.psalm/baseline.xml +++ b/.psalm/baseline.xml @@ -1,5 +1,5 @@ - + childNodes->item($i)]]> @@ -1570,10 +1570,27 @@ - - throw new SkippedTestError; - - + + $recordedOffsets], + array_filter([ + 'setting' => $recordedSettings, + 'extension_versions' => $extensionVersions, + ]) + )]]> + + + parsedRequirements = array_merge( + $requires, + ['__OFFSET' => $recordedOffsets], + array_filter([ + 'setting' => $recordedSettings, + 'extension_versions' => $extensionVersions, + ]) + )]]> + + &array{__FILE: string}, * setting?: array, @@ -1582,7 +1599,10 @@ * string, * string|array{version: string, operator: string}|array{constraint: string}|array * >]]> - + + + throw new SkippedTestError; + diff --git a/tools/psalm b/tools/psalm index 1166330689c..673e2aaa8f8 100755 Binary files a/tools/psalm and b/tools/psalm differ