Skip to content

Commit

Permalink
[Test] Reduce RunTestsInSeparateProcesses usage (#3667)
Browse files Browse the repository at this point in the history
* [Test] Remove RunTestsInSeparateProcesses usage

* [ci-review] Rector Rectify

* rename fixture classes

* rename fixture

* use FileCacheStorage for RenameClassRectorTest

* Revert use FileCacheStorage for RenameClassRectorTest

This reverts commit af7c37c.

* rename class

* rename fixture

* another rename

* rollback RunTestsInSeparateProcesses

---------

Co-authored-by: GitHub Action <actions@github.com>
  • Loading branch information
samsonasik and actions-user committed Apr 23, 2023
1 parent dc57cff commit 7bcda1e
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public function getParentClassMethod(ClassMethod $classMethod): ?MethodReflectio
if ($parentClassReflection->hasNativeMethod($methodName)) {
return $parentClassReflection->getNativeMethod($methodName);
}

$parentClassReflection = $parentClassReflection->getParentClass();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,13 @@
use PhpParser\Node\Stmt\Class_;
use PhpParser\Node\Stmt\Property;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use Rector\Core\PhpParser\Node\BetterNodeFinder;
use Rector\FileSystemRector\Parser\FileInfoParser;
use Rector\Naming\ExpectedNameResolver\MatchPropertyTypeExpectedNameResolver;
use Rector\Naming\ValueObject\PropertyRename;
use Rector\Naming\ValueObjectFactory\PropertyRenameFactory;
use Rector\Testing\PHPUnit\AbstractTestCase;

#[RunTestsInSeparateProcesses]
final class PropertyRenameFactoryTest extends AbstractTestCase
{
private PropertyRenameFactory $propertyRenameFactory;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Rector\Tests\Renaming\Rector\FileWithoutNamespace\PseudoNamespaceToNamespaceRector\Fixture;

class Fixture extends \PHPUnit_Framework_TestCase
class PhpUnit_Rename extends \PHPUnit_Framework_TestCase
{
public function create(\PHPUnit_Something $argument): \PHPUnit_Framework_Something
{
Expand All @@ -16,7 +16,7 @@ class Fixture extends \PHPUnit_Framework_TestCase

namespace Rector\Tests\Renaming\Rector\FileWithoutNamespace\PseudoNamespaceToNamespaceRector\Fixture;

class Fixture extends \PHPUnit\Framework\TestCase
class PhpUnit_Rename extends \PHPUnit\Framework\TestCase
{
public function create(\PHPUnit\Something $argument): \PHPUnit\Framework\Something
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Rector\Tests\Renaming\Rector\FileWithoutNamespace\PseudoNamespaceToNamespaceRector\Fixture;

class Fixture6
class PhpunitTestCaseSplit
{
/**
* @param \PHPUnit_Framework_TestCase $test
Expand All @@ -20,7 +20,7 @@ class Fixture6

namespace Rector\Tests\Renaming\Rector\FileWithoutNamespace\PseudoNamespaceToNamespaceRector\Fixture;

class Fixture6
class PhpunitTestCaseSplit
{
/**
* @param \PHPUnit\Framework\TestCase $test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@

use Iterator;
use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\Attributes\RunTestsInSeparateProcesses;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;

#[RunTestsInSeparateProcesses]
final class PseudoNamespaceToNamespaceRectorTest extends AbstractRectorTestCase
{
#[DataProvider('provideData')]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

namespace MyNamespace;

class MyClass
class MylegacyClass
{
/**
* @return MyClass
* @return MylegacyClass
*/
public function createSelf(): MyClass
public function createSelf(): MylegacyClass
{
return new MyClass;
return new MylegacyClass;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ class MyOldClass

namespace MyNamespace;

class MyNewClass
class MyNewClass2
{
/**
* @return \MyNamespace\MyNewClass
* @return \MyNamespace\MyNewClass2
*/
public function createSelf(): \MyNamespace\MyNewClass
public function createSelf(): \MyNamespace\MyNewClass2
{
return new \MyNamespace\MyNewClass;
return new \MyNamespace\MyNewClass2;
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

namespace Rector\Tests\Renaming\Rector\Name\RenameClassRector\Fixture;

use MyNamespace\MyClass;
use MyNamespace\MylegacyClass;

/**
* @template T of MyClass
* @template T of MylegacyClass
*/
interface MyServiceInterface
{
/**
* @return T
*/
public function get(): MyClass;
public function get(): MylegacyClass;
}

?>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
'Twig_AbstractManualExtension' => AbstractManualExtension::class,
'Twig_Extension_Sandbox' => 'Twig\Extension\SandboxExtension',
// Renaming class itself and its namespace
'MyNamespace\MyClass' => 'MyNewNamespace\MyNewClass',
'MyNamespace\MylegacyClass' => 'MyNewNamespace\MyNewClass',
'MyNamespace\MyTrait' => 'MyNewNamespace\MyNewTrait',
'MyNamespace\MyInterface' => 'MyNewNamespace\MyNewInterface',
'MyOldClass' => 'MyNamespace\MyNewClass',
'MyOldClass' => 'MyNamespace\MyNewClass2',
'AnotherMyOldClass' => 'AnotherMyNewClass',
'MyNamespace\AnotherMyClass' => 'MyNewClassWithoutNamespace',
// test duplicated class - @see https://github.com/rectorphp/rector/issues/1438
Expand Down

0 comments on commit 7bcda1e

Please sign in to comment.