Skip to content

Commit f11d56e

Browse files
authored
Merge branch refs/heads/1.12.x into 2.0.x
2 parents c77064a + e823540 commit f11d56e

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Diff for: .github/workflows/spelling.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
uses: actions/checkout@v4
1919

2020
- name: "Check for typos"
21-
uses: "crate-ci/typos@v1.24.6"
21+
uses: "crate-ci/typos@v1.25.0"
2222
with:
2323
files: "README.md src/"

Diff for: src/Type/Php/FilterFunctionReturnTypeHelper.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -397,13 +397,13 @@ private function getOptions(Type $flagsType, int $filterValue): array
397397

398398
$optionNames = array_merge(['default'], $this->getFilterTypeOptions()[$filterValue] ?? []);
399399
foreach ($optionNames as $optionName) {
400-
$optionaNameType = new ConstantStringType($optionName);
401-
if (!$optionsType->hasOffsetValueType($optionaNameType)->yes()) {
400+
$optionalNameType = new ConstantStringType($optionName);
401+
if (!$optionsType->hasOffsetValueType($optionalNameType)->yes()) {
402402
$options[$optionName] = null;
403403
continue;
404404
}
405405

406-
$options[$optionName] = $optionsType->getOffsetValueType($optionaNameType);
406+
$options[$optionName] = $optionsType->getOffsetValueType($optionalNameType);
407407
}
408408

409409
return $options;

0 commit comments

Comments
 (0)