Skip to content

Commit 7fe388f

Browse files
committed
Merge branch '1.12.x' into 2.0.x
2 parents 17239c1 + 95fbd57 commit 7fe388f

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/Type/Accessory/AccessoryUppercaseStringType.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,11 +344,6 @@ public function generalize(GeneralizePrecision $precision): Type
344344
return new StringType();
345345
}
346346

347-
public static function __set_state(array $properties): Type
348-
{
349-
return new self();
350-
}
351-
352347
public function exponentiate(Type $exponent): Type
353348
{
354349
return new BenevolentUnionType([

src/Type/Php/ParseStrParameterOutTypeExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function getParameterOutTypeFromFunctionCall(FunctionReflection $function
5353

5454
return new ArrayType(
5555
new UnionType([new StringType(), new IntegerType()]),
56-
new UnionType([new ArrayType(new MixedType(), new MixedType()), $valueType]),
56+
new UnionType([new ArrayType(new MixedType(), new MixedType(true)), $valueType]),
5757
);
5858
}
5959

0 commit comments

Comments
 (0)