Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/GuessTypeFromSwitcherAttributes.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ private function guessType(Arg $args, Scope $scope) : Type

if ($argsType instanceof IntersectionType && $argsType->isIterable()) {
// Let's look into each types to see if it contains 'raw' key.
foreach($argsType->getTypes() as $type) {
if ($type->hasOffsetValueType(new ConstantStringType('raw'))->yes()) {
$isRaw = $type->getOffsetValueType(new ConstantStringType('raw'))->getValue() ? TrinaryLogic::createYes() : TrinaryLogic::createNo();
$types = $argsType->getTypes();
foreach($types as $type) {
$rawKey = new ConstantStringType('raw');
if ($type->hasOffsetValueType($rawKey)->yes()) {
$isRaw = $type->getOffsetValueType($rawKey)->toBoolean()->isTrue() ? TrinaryLogic::createYes() : TrinaryLogic::createNo();
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/data/get_languages_list.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
assertType('array<int, mixed>', $model->get_languages_list($array));

// With array_merge() result passed as parameter.
assertType('array<int, mixed>', $model->get_languages_list(array_merge($array, ['fields' => 'slug'])));
assertType('array<int, string>', $model->get_languages_list(array_merge($array, ['fields' => 'slug'])));

// With 'fields' key set on top of variable containing unknown data.
$array['fields'] = 'slug';
Expand Down
2 changes: 1 addition & 1 deletion tests/data/pll_the_languages.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

// With unknown variable merged.
$args = array_merge( [ 'raw' => 1 ], $options );
assertType('array<string, mixed>|string', pll_the_languages($args));
assertType('array<string, mixed>', pll_the_languages($args));

// With raw attribute set to true outside.
$array['raw'] = 1;
Expand Down
2 changes: 1 addition & 1 deletion tests/data/the_languages.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

// With unknown variable merged.
$args = array_merge( $array, [ 'raw' => 1 ] );
assertType('array<string, mixed>|string', $switcher->the_languages($link, $args));
assertType('array<string, mixed>', $switcher->the_languages($link, $args));

// With raw attribute set to true outside.
$array['raw'] = 1;
Expand Down