Skip to content

Commit bea4f29

Browse files
TomasVotrubaondrejmirtes
authored andcommitted
check if JSON_THROW_ON_ERROR exists before infer
1 parent 1a124ea commit bea4f29

File tree

1 file changed

+2
-26
lines changed

1 file changed

+2
-26
lines changed

src/Type/Php/JsonThrowOnErrorDynamicReturnTypeExtension.php

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,21 @@
22

33
namespace PHPStan\Type\Php;
44

5-
<<<<<<< HEAD
6-
<<<<<<< HEAD
7-
<<<<<<< HEAD
8-
=======
9-
use PhpParser\Node\Arg;
10-
=======
11-
=======
125
use PhpParser\ConstExprEvaluationException;
13-
>>>>>>> decopule type resolution to static
146
use PhpParser\ConstExprEvaluator;
15-
>>>>>>> check for JSON_OBJECT_AS_ARRAY, in case of null and array
167
use PhpParser\Node\Expr;
17-
use PhpParser\Node\Expr\BinaryOp\BitwiseOr;
188
use PhpParser\Node\Expr\ConstFetch;
19-
>>>>>>> Extend JsonThrowOnErrorDynamicReturnTypeExtension to detect knonw type from contssant string value
209
use PhpParser\Node\Expr\FuncCall;
2110
use PhpParser\Node\Name\FullyQualified;
2211
use PHPStan\Analyser\Scope;
2312
use PHPStan\Reflection\FunctionReflection;
2413
use PHPStan\Reflection\ParametersAcceptorSelector;
2514
use PHPStan\Reflection\ReflectionProvider;
26-
<<<<<<< HEAD
27-
<<<<<<< HEAD
2815
use PHPStan\Type\BitwiseFlagHelper;
2916
use PHPStan\Type\Constant\ConstantBooleanType;
30-
=======
31-
use PHPStan\Type\ArrayType;
32-
use PHPStan\Type\BooleanType;
33-
=======
34-
>>>>>>> return mixed type
35-
use PHPStan\Type\Constant\ConstantBooleanType;
3617
use PHPStan\Type\Constant\ConstantIntegerType;
3718
use PHPStan\Type\Constant\ConstantStringType;
3819
use PHPStan\Type\ConstantTypeHelper;
39-
>>>>>>> Extend JsonThrowOnErrorDynamicReturnTypeExtension to detect knonw type from contssant string value
4020
use PHPStan\Type\DynamicFunctionReturnTypeExtension;
4121
use PHPStan\Type\MixedType;
4222
use PHPStan\Type\ObjectType;
@@ -53,22 +33,18 @@ class JsonThrowOnErrorDynamicReturnTypeExtension implements DynamicFunctionRetur
5333

5434
private const UNABLE_TO_RESOLVE = '__UNABLE_TO_RESOLVE__';
5535

36+
private ConstExprEvaluator $constExprEvaluator;
37+
5638
/** @var array<string, int> */
5739
private array $argumentPositions = [
5840
'json_encode' => 1,
5941
'json_decode' => 3,
6042
];
6143

62-
<<<<<<< HEAD
6344
public function __construct(
6445
private ReflectionProvider $reflectionProvider,
6546
private BitwiseFlagHelper $bitwiseFlagAnalyser,
6647
)
67-
=======
68-
private ConstExprEvaluator $constExprEvaluator;
69-
70-
public function __construct(private ReflectionProvider $reflectionProvider)
71-
>>>>>>> decopule type resolution to static
7248
{
7349
$this->constExprEvaluator = new ConstExprEvaluator(static function (Expr $expr) {
7450
if ($expr instanceof ConstFetch) {

0 commit comments

Comments
 (0)