Remove functions from TypeSpecifyingFunctionsDynamicReturnTypeExtension

ondrejmirtes · ondrejmirtes · commit 10855dc489eb · 2023-01-13T10:25:36.000+01:00
diff --git a/src/Analyser/NodeScopeResolver.php b/src/Analyser/NodeScopeResolver.php
@@ -2162,11 +2162,7 @@ static function (?Type $offsetType, Type $valueType, bool $optional) use (&$arra
 				$className = $scope->resolveName($expr->class);
 				if ($this->reflectionProvider->hasClass($className)) {
 					$classReflection = $this->reflectionProvider->getClass($className);
-					if (is_string($expr->name)) {
-						$methodName = $expr->name;
-					} else {
-						$methodName = $expr->name->name;
-					}
+					$methodName = $expr->name->name;
 					if ($classReflection->hasMethod($methodName)) {
 						$methodReflection = $classReflection->getMethod($methodName, $scope);
 						$parametersAcceptor = ParametersAcceptorSelector::selectFromArgs(
diff --git a/src/Type/Php/TypeSpecifyingFunctionsDynamicReturnTypeExtension.php b/src/Type/Php/TypeSpecifyingFunctionsDynamicReturnTypeExtension.php
@@ -38,25 +38,10 @@ public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
 	public function isFunctionSupported(FunctionReflection $functionReflection): bool
 	{
 		return in_array($functionReflection->getName(), [
-			'array_is_list',
 			'array_key_exists',
 			'key_exists',
 			'in_array',
-			'is_numeric',
-			'is_int',
-			'is_array',
-			'is_bool',
-			'is_callable',
-			'is_float',
-			'is_double',
-			'is_real',
-			'is_iterable',
-			'is_null',
-			'is_object',
-			'is_scalar',
-			'is_string',
 			'is_subclass_of',
-			'is_countable',
 		], true);
 	}
 
diff --git a/stubs/arrayFunctions.stub b/stubs/arrayFunctions.stub
@@ -67,6 +67,6 @@ function array_udiff(
 
 /**
  * @param array<array-key, mixed> $value
- * @phpstan-assert-if-true list<mixed> $value
+ * @return ($value is list ? true : false)
  */
 function array_is_list(array $value): bool {}
diff --git a/stubs/core.stub b/stubs/core.stub
@@ -308,5 +308,6 @@ function headers_sent(string &$filename = null, int &$line = null): bool {}
 
 /**
  * @param-out callable-string $callable_name
+ * @return ($value is callable ? true : false)
  */
 function is_callable(mixed $value, bool $syntax_only = false, string &$callable_name = null): bool {}
diff --git a/stubs/typeCheckingFunctions.stub b/stubs/typeCheckingFunctions.stub
@@ -1,103 +1,103 @@
 <?php
 
 /**
- * @phpstan-assert-if-true string $value
+ * @return ($value is string ? true : false)
  */
 function is_string(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true float $value
+ * @return ($value is float ? true : false)
  */
 function is_float(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true float $value
+ * @return ($value is float ? true : false)
  */
 function is_double(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true float $value
+ * @return ($value is float ? true : false)
  */
 function is_real(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true float|int|numeric-string $value
+ * @return ($value is float|int|numeric-string ? true : false)
  */
 function is_numeric(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true null $value
+ * @return ($value is null ? true : false)
  */
 function is_null(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true bool $value
+ * @return ($value is bool ? true : false)
  */
 function is_bool(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true array<array-key, mixed>|\Countable $value
+ * @return ($value is array<array-key, mixed>|\Countable ? true : false)
  */
 function is_countable(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true object $value
+ * @return ($value is object ? true : false)
  */
 function is_object(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true scalar $value
+ * @return ($value is scalar ? true : false)
  */
 function is_scalar(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true int $value
+ * @return ($value is int ? true : false)
  */
 function is_int(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true int $value
+ * @return ($value is int ? true : false)
  */
 function is_integer(mixed $value): bool
 {
 
 }
 
 /**
- * @phpstan-assert-if-true int $value
+ * @return ($value is int ? true : false)
  */
 function is_long(mixed $value): bool
 {
@@ -106,8 +106,25 @@ function is_long(mixed $value): bool
 
 /**
  * @phpstan-assert-if-true resource $value
+ * @return bool
  */
 function is_resource(mixed $value): bool
 {
 
 }
+
+/**
+ * @return ($value is array ? true : false)
+ */
+function is_array(mixed $value): bool
+{
+
+}
+
+/**
+ * @return ($value is iterable<mixed, mixed> ? true : false)
+ */
+function is_iterable(mixed $value): bool
+{
+
+}

Original file line number	Diff line number	Diff line change
`@@ -1,103 +1,103 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`/**`
`4`		`- * @phpstan-assert-if-true string $value`
	`4`	`+ * @return ($value is string ? true : false)`
`5`	`5`	`*/`
`6`	`6`	`function is_string(mixed $value): bool`
`7`	`7`	`{`
`8`	`8`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`/**`
`12`		`- * @phpstan-assert-if-true float $value`
	`12`	`+ * @return ($value is float ? true : false)`
`13`	`13`	`*/`
`14`	`14`	`function is_float(mixed $value): bool`
`15`	`15`	`{`
`16`	`16`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/**`
`20`		`- * @phpstan-assert-if-true float $value`
	`20`	`+ * @return ($value is float ? true : false)`
`21`	`21`	`*/`
`22`	`22`	`function is_double(mixed $value): bool`
`23`	`23`	`{`
`24`	`24`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/**`
`28`		`- * @phpstan-assert-if-true float $value`
	`28`	`+ * @return ($value is float ? true : false)`
`29`	`29`	`*/`
`30`	`30`	`function is_real(mixed $value): bool`
`31`	`31`	`{`
`32`	`32`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`36`		`- * @phpstan-assert-if-true float\|int\|numeric-string $value`
	`36`	`+ * @return ($value is float\|int\|numeric-string ? true : false)`
`37`	`37`	`*/`
`38`	`38`	`function is_numeric(mixed $value): bool`
`39`	`39`	`{`
`40`	`40`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`/**`
`44`		`- * @phpstan-assert-if-true null $value`
	`44`	`+ * @return ($value is null ? true : false)`
`45`	`45`	`*/`
`46`	`46`	`function is_null(mixed $value): bool`
`47`	`47`	`{`
`48`	`48`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`/**`
`52`		`- * @phpstan-assert-if-true bool $value`
	`52`	`+ * @return ($value is bool ? true : false)`
`53`	`53`	`*/`
`54`	`54`	`function is_bool(mixed $value): bool`
`55`	`55`	`{`
`56`	`56`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`/**`
`60`		`- * @phpstan-assert-if-true array<array-key, mixed>\|\Countable $value`
	`60`	`+ * @return ($value is array<array-key, mixed>\|\Countable ? true : false)`
`61`	`61`	`*/`
`62`	`62`	`function is_countable(mixed $value): bool`
`63`	`63`	`{`
`64`	`64`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/**`
`68`		`- * @phpstan-assert-if-true object $value`
	`68`	`+ * @return ($value is object ? true : false)`
`69`	`69`	`*/`
`70`	`70`	`function is_object(mixed $value): bool`
`71`	`71`	`{`
`72`	`72`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`
`76`		`- * @phpstan-assert-if-true scalar $value`
	`76`	`+ * @return ($value is scalar ? true : false)`
`77`	`77`	`*/`
`78`	`78`	`function is_scalar(mixed $value): bool`
`79`	`79`	`{`
`80`	`80`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`/**`
`84`		`- * @phpstan-assert-if-true int $value`
	`84`	`+ * @return ($value is int ? true : false)`
`85`	`85`	`*/`
`86`	`86`	`function is_int(mixed $value): bool`
`87`	`87`	`{`
`88`	`88`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`/**`
`92`		`- * @phpstan-assert-if-true int $value`
	`92`	`+ * @return ($value is int ? true : false)`
`93`	`93`	`*/`
`94`	`94`	`function is_integer(mixed $value): bool`
`95`	`95`	`{`
`96`	`96`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/**`
`100`		`- * @phpstan-assert-if-true int $value`
	`100`	`+ * @return ($value is int ? true : false)`
`101`	`101`	`*/`
`102`	`102`	`function is_long(mixed $value): bool`
`103`	`103`	`{`
`@@ -106,8 +106,25 @@ function is_long(mixed $value): bool`
`106`	`106`
`107`	`107`	`/**`
`108`	`108`	`* @phpstan-assert-if-true resource $value`
	`109`	`+ * @return bool`
`109`	`110`	`*/`
`110`	`111`	`function is_resource(mixed $value): bool`
`111`	`112`	`{`
`112`	`113`
`113`	`114`	`}`
	`115`	`+`
	`116`	`+/**`
	`117`	`+ * @return ($value is array ? true : false)`
	`118`	`+ */`
	`119`	`+function is_array(mixed $value): bool`
	`120`	`+{`
	`121`	`+`
	`122`	`+}`
	`123`	`+`
	`124`	`+/**`
	`125`	`+ * @return ($value is iterable<mixed, mixed> ? true : false)`
	`126`	`+ */`
	`127`	`+function is_iterable(mixed $value): bool`
	`128`	`+{`
	`129`	`+`
	`130`	`+}`