Skip to content

[TypeDeclaration] Retarget ReturnTypeFromMockObjectRector and AddVoidReturnTypeWhereNoReturnRector to class-level node #8828

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
TomasVotruba merged 1 commit into from
Oct 25, 2026
Merged

[TypeDeclaration] Retarget ReturnTypeFromMockObjectRector and AddVoidReturnTypeWhereNoReturnRector to class-level node #8828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...VoidReturnTypeWhereNoReturnRectorTest.php → ...VoidReturnTypeWhereNoReturnRectorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

declare(strict_types=1);

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector;

use Iterator;
use PHPUnit\Framework\Attributes\DataProvider;
Expand Down
4 changes: 2 additions & 2 deletions ...eNoReturnRector/Fixture/exception.php.inc → ...eNoReturnRector/Fixture/exception.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

use Rector\Exception\ShouldNotHappenException;

Expand All @@ -15,7 +15,7 @@ final class ThrowsException
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

use Rector\Exception\ShouldNotHappenException;

Expand Down
4 changes: 2 additions & 2 deletions ...e/external_implicit_void_override.php.inc → ...e/external_implicit_void_override.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;

Expand All @@ -15,7 +15,7 @@ final class ExternalImplicitVoidOverride extends PhpFileLoader
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;

Expand Down
25 changes: 25 additions & 0 deletions ...tor/ClassLike/AddVoidReturnTypeWhereNoReturnRector/Fixture/final_protected_method.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class FinalProtectedMethod
{
protected function getValues()
{
}
}

?>
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class FinalProtectedMethod
{
protected function getValues(): void
{
}
}

?>
4 changes: 2 additions & 2 deletions ...ReturnRector/Fixture/magic_invoke.php.inc → ...ReturnRector/Fixture/magic_invoke.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class MagicInvoke
{
Expand All @@ -14,7 +14,7 @@ final class MagicInvoke
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class MagicInvoke
{
Expand Down
4 changes: 2 additions & 2 deletions ...ReturnRector/Fixture/never_method.php.inc → ...ReturnRector/Fixture/never_method.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class ExitMethod
{
Expand All @@ -13,7 +13,7 @@ final class ExitMethod
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class ExitMethod
{
Expand Down
4 changes: 2 additions & 2 deletions ...tor/Fixture/parent_and_child_void.php.inc → ...tor/Fixture/parent_and_child_void.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

/**
* Both classes have to be in the same fixture, as the one that needs to be skipped is the parent class
Expand All @@ -23,7 +23,7 @@ final class SomeChildFromVoid extends ParentAndChildvoid
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

/**
* Both classes have to be in the same fixture, as the one that needs to be skipped is the parent class
Expand Down
4 changes: 2 additions & 2 deletions ...ture/return_inside_inner_function.php.inc → ...ture/return_inside_inner_function.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class ReturnInsideInnerFunction
{
Expand All @@ -21,7 +21,7 @@ final class ReturnInsideInnerFunction
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class ReturnInsideInnerFunction
{
Expand Down
2 changes: 1 addition & 1 deletion ...Fixture/skip_abstract_empty_class.php.inc → ...Fixture/skip_abstract_empty_class.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

abstract class SkipAbstractEmptyClass
{
Expand Down
8 changes: 8 additions & 0 deletions ...ector/ClassLike/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_abstract_method.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

abstract class SkipAbstractMethod
{
public abstract function getValues();
}
2 changes: 1 addition & 1 deletion ...Rector/Fixture/skip_existing_type.php.inc → ...Rector/Fixture/skip_existing_type.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

use Iterator;

Expand Down
13 changes: 13 additions & 0 deletions ...Rector/ClassLike/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_final_docblock.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

/**
* @final
*/
class SkipFinalDocblock
{
protected function someMethod()
{
}
}
14 changes: 14 additions & 0 deletions ...Rector/ClassLike/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_from_external2.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

use Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Source\vendor\Foo;

final class SkipFromExternal2
{
use Foo;

public function load($resource, string $type = null)
{
}
}
2 changes: 1 addition & 1 deletion ...ted_closure_return_in_fluent_call.php.inc → ...ted_closure_return_in_fluent_call.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

class SkipNestedClosureReturnInFluentCall
{
Expand Down
10 changes: 10 additions & 0 deletions ...ector/ClassLike/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_non_final_empty.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

class SkipNonFinalEmpty
{
public function getItem()
{
}
}
10 changes: 10 additions & 0 deletions ...Like/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_non_final_protected_method.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

class SkipNonFinalProtectedMethod
{
protected function getValues()
{
}
}
2 changes: 1 addition & 1 deletion ...ure/skip_non_final_with_exception.php.inc → ...ure/skip_non_final_with_exception.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

use Rector\Exception\ShouldNotHappenException;

Expand Down
2 changes: 1 addition & 1 deletion ...ture/skip_parent_only_return_void.php.inc → ...ture/skip_parent_only_return_void.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

class SkipParentOnlyReturnVoid
{
Expand Down
2 changes: 1 addition & 1 deletion ...oReturnRector/Fixture/skip_return.php.inc → ...oReturnRector/Fixture/skip_return.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class SkipReturnAfterClosureReturn
{
Expand Down
2 changes: 1 addition & 1 deletion .../Fixture/skip_return_of_something.php.inc → .../Fixture/skip_return_of_something.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class SkipReturnOfSomething
{
Expand Down
11 changes: 11 additions & 0 deletions ...laration/Rector/ClassLike/AddVoidReturnTypeWhereNoReturnRector/Fixture/skip_yield.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class SkipYield
{
public function getValues()
{
yield [1000];
}
}
4 changes: 2 additions & 2 deletions ...NoReturnRector/Fixture/some_class.php.inc → ...NoReturnRector/Fixture/some_class.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class SomeClass
{
Expand All @@ -15,7 +15,7 @@ final class SomeClass
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class SomeClass
{
Expand Down
4 changes: 2 additions & 2 deletions ...NoReturnRector/Fixture/some_trait.php.inc → ...NoReturnRector/Fixture/some_trait.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

trait AuthUserTrait
{
Expand All @@ -15,7 +15,7 @@ trait AuthUserTrait
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

trait AuthUserTrait
{
Expand Down
4 changes: 2 additions & 2 deletions ...eturnRector/Fixture/throws_method.php.inc → ...eturnRector/Fixture/throws_method.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class ThrowsMethod
{
Expand All @@ -18,7 +18,7 @@ final class ThrowsMethod
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class ThrowsMethod
{
Expand Down
4 changes: 2 additions & 2 deletions ...or/Fixture/void_on_private_method.php.inc → ...or/Fixture/void_on_private_method.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class VoidOnPrivateMethod
{
Expand All @@ -15,7 +15,7 @@ final class VoidOnPrivateMethod
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class VoidOnPrivateMethod
{
Expand Down
4 changes: 2 additions & 2 deletions ...xture/yield_inside_inner_function.php.inc → ...xture/yield_inside_inner_function.php.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class YieldInsideInnerFunction
{
Expand All @@ -16,7 +16,7 @@ final class YieldInsideInnerFunction
-----
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector\Fixture;
namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Fixture;

final class YieldInsideInnerFunction
{
Expand Down
10 changes: 10 additions & 0 deletions ...peDeclaration/Rector/ClassLike/AddVoidReturnTypeWhereNoReturnRector/Source/vendor/Foo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

namespace Rector\Tests\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector\Source\vendor;

trait Foo
{
public function load($resource, string $type = null): string
{
}
}
2 changes: 1 addition & 1 deletion ...NoReturnRector/config/configured_rule.php → ...NoReturnRector/config/configured_rule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
declare(strict_types=1);

use Rector\Config\RectorConfig;
use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
use Rector\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector;

return RectorConfig::configure()
->withRules([AddVoidReturnTypeWhereNoReturnRector::class]);
25 changes: 0 additions & 25 deletions ...r/ClassMethod/AddVoidReturnTypeWhereNoReturnRector/Fixture/final_protected_method.php.inc
View file
Open in desktop

This file was deleted.

Loading
Loading