Improve compatibility with nikic/php-parser 4.13.0

ondrejmirtes · ondrejmirtes · commit f4654b27b107 · 2021-09-20T18:12:57.000+02:00
diff --git a/src/Type/Nette/ComponentGetPresenterDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentGetPresenterDynamicReturnTypeExtension.php
@@ -32,15 +32,15 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		$defaultReturnType = $methodDefinition->getReturnType();
 		$firstParameterExists = count($methodDefinition->getParameters()) > 0;
 
-		if (count($methodCall->args) < 1) {
+		if (count($methodCall->getArgs()) < 1) {
 			if (!$firstParameterExists) {
 				return TypeCombinator::removeNull($defaultReturnType);
 			}
 
 			return $defaultReturnType;
 		}
 
-		$paramNeedExpr = $methodCall->args[0]->value;
+		$paramNeedExpr = $methodCall->getArgs()[0]->value;
 		$paramNeedType = $scope->getType($paramNeedExpr);
 
 		if ($paramNeedType instanceof ConstantBooleanType) {
diff --git a/src/Type/Nette/ComponentLookupDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentLookupDynamicReturnTypeExtension.php
@@ -29,11 +29,11 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		$defaultReturnType = ParametersAcceptorSelector::selectSingle(
 			$methodReflection->getVariants()
 		)->getReturnType();
-		if (count($methodCall->args) < 2) {
+		if (count($methodCall->getArgs()) < 2) {
 			return $defaultReturnType;
 		}
 
-		$paramNeedExpr = $methodCall->args[1]->value;
+		$paramNeedExpr = $methodCall->getArgs()[1]->value;
 		$paramNeedType = $scope->getType($paramNeedExpr);
 
 		if ($paramNeedType instanceof ConstantBooleanType) {
diff --git a/src/Type/Nette/ComponentModelArrayAccessDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentModelArrayAccessDynamicReturnTypeExtension.php
@@ -34,7 +34,7 @@ public function getTypeFromMethodCall(
 	{
 		$calledOnType = $scope->getType($methodCall->var);
 		$mixedType = new MixedType();
-		$args = $methodCall->args;
+		$args = $methodCall->getArgs();
 		if (count($args) !== 1) {
 			return $mixedType;
 		}
diff --git a/src/Type/Nette/ComponentModelDynamicReturnTypeExtension.php b/src/Type/Nette/ComponentModelDynamicReturnTypeExtension.php
@@ -34,7 +34,7 @@ public function getTypeFromMethodCall(
 	{
 		$calledOnType = $scope->getType($methodCall->var);
 		$mixedType = new MixedType();
-		$args = $methodCall->args;
+		$args = $methodCall->getArgs();
 		if (count($args) !== 1) {
 			return $mixedType;
 		}
diff --git a/src/Type/Nette/FormContainerUnsafeValuesDynamicReturnTypeExtension.php b/src/Type/Nette/FormContainerUnsafeValuesDynamicReturnTypeExtension.php
@@ -30,11 +30,11 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
-		if (count($methodCall->args) === 0) {
+		if (count($methodCall->getArgs()) === 0) {
 			return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
 		}
 
-		$arg = $methodCall->args[0]->value;
+		$arg = $methodCall->getArgs()[0]->value;
 		$scopedType = $scope->getType($arg);
 		if ($scopedType instanceof NullType) {
 			return new ObjectType('Nette\Utils\ArrayHash');
diff --git a/src/Type/Nette/FormContainerValuesDynamicReturnTypeExtension.php b/src/Type/Nette/FormContainerValuesDynamicReturnTypeExtension.php
@@ -29,11 +29,11 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
-		if (count($methodCall->args) === 0) {
+		if (count($methodCall->getArgs()) === 0) {
 			return new ObjectType('Nette\Utils\ArrayHash');
 		}
 
-		$arg = $methodCall->args[0]->value;
+		$arg = $methodCall->getArgs()[0]->value;
 		$scopedType = $scope->getType($arg);
 		if (!$scopedType instanceof ConstantBooleanType) {
 			return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();
diff --git a/src/Type/Nette/PresenterGetSessionReturnTypeExtension.php b/src/Type/Nette/PresenterGetSessionReturnTypeExtension.php
@@ -25,7 +25,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type
 	{
-		if (count($methodCall->args) === 0 || $scope->getType($methodCall->args[0]->value) instanceof NullType) {
+		if (count($methodCall->getArgs()) === 0 || $scope->getType($methodCall->getArgs()[0]->value) instanceof NullType) {
 			return new ObjectType('Nette\Http\Session');
 		}
 
diff --git a/src/Type/Nette/ServiceLocatorDynamicReturnTypeExtension.php b/src/Type/Nette/ServiceLocatorDynamicReturnTypeExtension.php
@@ -39,20 +39,20 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method
 		], true)) {
 			return $mixedType;
 		}
-		if (count($methodCall->args) === 0) {
+		if (count($methodCall->getArgs()) === 0) {
 			return $mixedType;
 		}
-		$argType = $scope->getType($methodCall->args[0]->value);
+		$argType = $scope->getType($methodCall->getArgs()[0]->value);
 		if (!$argType instanceof ConstantStringType) {
 			return $mixedType;
 		}
 
 		$type = new ObjectType($argType->getValue());
 		if (
 			$methodReflection->getName() === 'getByType'
-			&& count($methodCall->args) >= 2
+			&& count($methodCall->getArgs()) >= 2
 		) {
-			$throwType = $scope->getType($methodCall->args[1]->value);
+			$throwType = $scope->getType($methodCall->getArgs()[1]->value);
 			if (
 				!$throwType instanceof ConstantBooleanType
 				|| !$throwType->getValue()
diff --git a/tests/Type/Nette/FormContainerValuesDynamicReturnTypeExtensionTest.php b/tests/Type/Nette/FormContainerValuesDynamicReturnTypeExtensionTest.php
@@ -44,16 +44,14 @@ public function testParameterAsArray(): void
 		$scope = $this->createMock(Scope::class);
 		$scope->method('getType')->willReturn(new ConstantBooleanType(true));
 
-		/** @var \PhpParser\Node\Expr\MethodCall $methodCall */
 		$methodCall = $this->createMock(MethodCall::class);
-		/** @var \PhpParser\Node\Arg $arg */
 		$arg = $this->createMock(Arg::class);
-		/** @var \PhpParser\Node\Expr $value */
 		$value = $this->createMock(Expr::class);
 		$arg->value = $value;
 		$methodCall->args = [
 			0 => $arg,
 		];
+		$methodCall->method('getArgs')->willReturn($methodCall->args);
 
 		$resultType = $this->extension->getTypeFromMethodCall($methodReflection, $methodCall, $scope);
 
@@ -70,16 +68,14 @@ public function testParameterAsArrayHash(): void
 		$scope = $this->createMock(Scope::class);
 		$scope->method('getType')->willReturn(new ConstantBooleanType(false));
 
-		/** @var \PhpParser\Node\Expr\MethodCall $methodCall */
 		$methodCall = $this->createMock(MethodCall::class);
-		/** @var \PhpParser\Node\Arg $arg */
 		$arg = $this->createMock(Arg::class);
-		/** @var \PhpParser\Node\Expr $value */
 		$value = $this->createMock(Expr::class);
 		$arg->value = $value;
 		$methodCall->args = [
 			0 => $arg,
 		];
+		$methodCall->method('getArgs')->willReturn($methodCall->args);
 
 		$resultType = $this->extension->getTypeFromMethodCall($methodReflection, $methodCall, $scope);
 
@@ -97,9 +93,9 @@ public function testDefaultParameterIsArrayHash(): void
 		$scope = $this->createMock(Scope::class);
 		$scope->method('getType')->willReturn(new ConstantBooleanType(false));
 
-		/** @var \PhpParser\Node\Expr\MethodCall $methodCall */
 		$methodCall = $this->createMock(MethodCall::class);
 		$methodCall->args = [];
+		$methodCall->method('getArgs')->willReturn($methodCall->args);
 
 		$resultType = $this->extension->getTypeFromMethodCall($methodReflection, $methodCall, $scope);
 

Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,15 @@ public function getTypeFromMethodCall(MethodReflection $methodReflection, Method`
`32`	`32`	`$defaultReturnType = $methodDefinition->getReturnType();`
`33`	`33`	`$firstParameterExists = count($methodDefinition->getParameters()) > 0;`
`34`	`34`
`35`		`- if (count($methodCall->args) < 1) {`
	`35`	`+ if (count($methodCall->getArgs()) < 1) {`
`36`	`36`	`if (!$firstParameterExists) {`
`37`	`37`	`return TypeCombinator::removeNull($defaultReturnType);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`return $defaultReturnType;`
`41`	`41`	`}`
`42`	`42`
`43`		`- $paramNeedExpr = $methodCall->args[0]->value;`
	`43`	`+ $paramNeedExpr = $methodCall->getArgs()[0]->value;`
`44`	`44`	`$paramNeedType = $scope->getType($paramNeedExpr);`
`45`	`45`
`46`	`46`	`if ($paramNeedType instanceof ConstantBooleanType) {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public function getTypeFromMethodCall(`
`34`	`34`	`{`
`35`	`35`	`$calledOnType = $scope->getType($methodCall->var);`
`36`	`36`	`$mixedType = new MixedType();`
`37`		`- $args = $methodCall->args;`
	`37`	`+ $args = $methodCall->getArgs();`
`38`	`38`	`if (count($args) !== 1) {`
`39`	`39`	`return $mixedType;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`30`	`30`
`31`	`31`	`public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
`32`	`32`	`{`
`33`		`- if (count($methodCall->args) === 0) {`
	`33`	`+ if (count($methodCall->getArgs()) === 0) {`
`34`	`34`	`return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
`35`	`35`	`}`
`36`	`36`
`37`		`- $arg = $methodCall->args[0]->value;`
	`37`	`+ $arg = $methodCall->getArgs()[0]->value;`
`38`	`38`	`$scopedType = $scope->getType($arg);`
`39`	`39`	`if ($scopedType instanceof NullType) {`
`40`	`40`	`return new ObjectType('Nette\Utils\ArrayHash');`
Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`29`	`29`
`30`	`30`	`public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
`31`	`31`	`{`
`32`		`- if (count($methodCall->args) === 0) {`
	`32`	`+ if (count($methodCall->getArgs()) === 0) {`
`33`	`33`	`return new ObjectType('Nette\Utils\ArrayHash');`
`34`	`34`	`}`
`35`	`35`
`36`		`- $arg = $methodCall->args[0]->value;`
	`36`	`+ $arg = $methodCall->getArgs()[0]->value;`
`37`	`37`	`$scopedType = $scope->getType($arg);`
`38`	`38`	`if (!$scopedType instanceof ConstantBooleanType) {`
`39`	`39`	`return ParametersAcceptorSelector::selectSingle($methodReflection->getVariants())->getReturnType();`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public function isMethodSupported(MethodReflection $methodReflection): bool`
`25`	`25`
`26`	`26`	`public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): Type`
`27`	`27`	`{`
`28`		`- if (count($methodCall->args) === 0 \|\| $scope->getType($methodCall->args[0]->value) instanceof NullType) {`
	`28`	`+ if (count($methodCall->getArgs()) === 0 \|\| $scope->getType($methodCall->getArgs()[0]->value) instanceof NullType) {`
`29`	`29`	`return new ObjectType('Nette\Http\Session');`
`30`	`30`	`}`
`31`	`31`