Skip to content

[Rectify] [Php81] Enable Rectify for Return Never Type only #1381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samsonasik merged 5 commits into from
Dec 4, 2021
Merged

[Rectify] [Php81] Enable Rectify for Return Never Type only #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f9e419
[Rectify] [Php81] Enable Rectify for Return Never Type only
samsonasik Dec 4, 2021
5a06104
[ci-review] Rector Rectify
actions-user Dec 4, 2021
f37f9d3
[ci-review] Rector Rectify
actions-user Dec 4, 2021
1f1e5dc
Merge branch 'main' into enable-return-never-type
samsonasik Dec 4, 2021
8bd6142
Merge branch 'main' into enable-return-never-type
samsonasik Dec 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions packages/PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

namespace Rector\PHPStanStaticTypeMapper\TypeMapper;

use PhpParser\Node;
use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode;
use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
use PHPStan\PhpDocParser\Ast\Type\TypeNode;
Expand Down Expand Up @@ -38,7 +37,7 @@ public function mapToPHPStanPhpDocTypeNode(Type $type, TypeKind $typeKind): Type
/**
* @param HasOffsetType $type
*/
public function mapToPhpParserNode(Type $type, TypeKind $typeKind): ?Node
public function mapToPhpParserNode(Type $type, TypeKind $typeKind): never
Copy link
Copy Markdown
Contributor

@staabm staabm Dec 4, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this legal, since the return type of ?Node was part of TypeMapperInterface contract/interface?

Copy link
Copy Markdown
Member Author

@samsonasik samsonasik Dec 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems cause error on scoping https://github.com/rectorphp/rector-src/runs/4418027866?check_suite_focus=true#step:23:7

Run cd remote-repository && bin/rector list --ansi && cd ..
  cd remote-repository && bin/rector list --ansi && cd ..
  shell: /usr/bin/bash -e {0}
  env:
    COMPOSER_ROOT_VERSION: dev-main
PHP Fatal error:  Declaration of Rector\PHPStanStaticTypeMapper\TypeMapper\HasOffsetTypeMapper::mapToPhpParserNode($type, $typeKind) must be compatible with Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface::mapToPhpParserNode($type, $typeKind): ?PhpParser\Node in /home/runner/work/rector-src/rector-src/remote-repository/packages/PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php on line 17
Fatal error: Declaration of Rector\PHPStanStaticTypeMapper\TypeMapper\HasOffsetTypeMapper::mapToPhpParserNode($type, $typeKind) must be compatible with Rector\PHPStanStaticTypeMapper\Contract\TypeMapperInterface::mapToPhpParserNode($type, $typeKind): ?PhpParser\Node in /home/runner/work/rector-src/rector-src/remote-repository/packages/PHPStanStaticTypeMapper/TypeMapper/HasOffsetTypeMapper.php on line 17
Error: Process completed with exit code 255

I will check.

Copy link
Copy Markdown
Member Author

@samsonasik samsonasik Dec 4, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed at #1390

{
throw new ShouldNotHappenException();
}
Expand Down
4 changes: 1 addition & 3 deletions rector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
use Rector\Privatization\Rector\Class_\FinalizeClassesWithoutChildrenRector;
use Rector\Set\ValueObject\LevelSetList;
use Rector\Set\ValueObject\SetList;
use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;

return static function (ContainerConfigurator $containerConfigurator): void {
Expand Down Expand Up @@ -83,8 +82,7 @@
MyCLabsClassToEnumRector::class,
SpatieEnumClassToEnumRector::class,

// temporary skip non finalize public class constant rector
ReturnNeverTypeRector::class,
// temporary skip non return never type rector
MyCLabsMethodCallToEnumConstRector::class,
Php81ResourceReturnToObjectRector::class,

Expand Down