[TypeDeclaration] Add return empty string defined support on ReturnTypeFromStrictScalarReturnExprRector

[samsonasik]

Fixes rectorphp/rector#8181

[samsonasik]

Fixed 🎉 /cc @staabm

[staabm]

I think we can simplify the test. otherwise its great, thanks!

Suggested change

	final class ReturnEmptyString
	{
	private function generateStyle(array $values, string $padding)
	{
	$style = '';
	if ('' != $values['background-color']) {
	$style = 'something';
	if ('' != $padding) {
	$style .= $padding;
	}
	}
	if ('' != $style) {
	return ' style="'.$style.'"';
	}
	return $style;
	}
	}
	?>
	-----
	<?php
	namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
	final class ReturnEmptyString
	{
	private function generateStyle(array $values, string $padding): string
	{
	$style = '';
	if ('' != $values['background-color']) {
	$style = 'something';
	if ('' != $padding) {
	$style .= $padding;
	}
	}
	if ('' != $style) {
	return ' style="'.$style.'"';
	}
	return $style;
	}
	}
	final class ReturnEmptyString
	{
	private function generateStyle(array $values, string $padding)
	{
	$style = '';
	if ('' != $values['background-color']) {
	$style = 'something';
	}
	if ('' != $style) {
	return ' style="'.$style.'"';
	}
	return $style;
	}
	}
	?>
	-----
	<?php
	namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\Fixture;
	final class ReturnEmptyString
	{
	private function generateStyle(array $values, string $padding): string
	{
	$style = '';
	if ('' != $values['background-color']) {
	$style = 'something';
	}
	if ('' != $style) {
	return ' style="'.$style.'"';
	}
	return $style;
	}
	}

[samsonasik]

Oh, I merge too fast 😄

[samsonasik]

@staabm feel free to create PR for updated fixture :)

[samsonasik]

All checks have passed 🎉 @TomasVotruba I am merging it ;)

[staabm]

you might try $type->isScalar()->yes()

[samsonasik]

I will try 👍

[samsonasik]

It seems got error on StringType calling undefined isScalar()

There was 1 error:

1) Rector\Tests\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromStrictScalarReturnExprRector\ReturnTypeFromStrictScalarReturnExprRectorTest::test with data set #7
Error: Call to undefined method PHPStan\Type\StringType::isScalarType()

[samsonasik]

oh, it isScalar() instead of isScalarType(), I will create new PR.

[samsonasik]

#4920

[TomasVotruba]

This was on pourpose to avoid leaky do types.
Would this skip the docblock string type?

[samsonasik]

The type definition is native type, see line 81:

rector-src/rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php

Lines 81 to 82 in aee4200

	$type = $this->nodeTypeResolver->getNativeType($cast);
	if ($type->isScalar()->yes()) {

that's will skip docblock read as type :)

[samsonasik]

also on line 71, use native type as well:

rector-src/rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php

Lines 71 to 72 in aee4200

	$exprType = $this->nodeTypeResolver->getNativeType($expr);
	if ($exprType->isScalar()->yes()) {

[TomasVotruba]

I vaguely recall PHPStan resolved this incorrectly, once the method call was in external file. Making docblock as native types.

If it works, all good :)

[samsonasik]

for FuncCall, and native Function Reflection, it require ->getReturnType() instead of ->getNativeReturnType(), that's expected as PHPStan seems doens't read it based on defined Func Call, see

rector-src/rules/TypeDeclaration/TypeAnalyzer/AlwaysStrictScalarExprAnalyzer.php

Lines 139 to 140 in aee4200

	$returnType = $parametersAcceptor->getReturnType();
	if ($returnType->isScalar()->yes()) {