octoleo/rector
1
1
Fork 0
mirror of https://github.com/rectorphp/rector.git synced 2024-07-01 07:03:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename ValueObjectRemover*Rector to more propper ObjectToScalar*Rector

Browse Source
This commit is contained in:
Tomas Votruba 2018-12-14 20:34:40 +01:00
parent c10a32a67b
commit 2b29db0839
23 changed files with 165 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/AbstractValueObjectRemoverRector.php → packages/DomainDrivenDesign/src/Rector/ObjectToScalar/AbstractObjectToScalarRector.php
View File

@ -1,15 +1,14 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Rector\ValueObjectRemover;
namespace Rector\DomainDrivenDesign\Rector\ObjectToScalar;
use PhpParser\Node;
use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\DocBlockAnalyzer;
use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\NamespaceAnalyzer;
use Rector\NodeTypeResolver\PhpDoc\NodeAnalyzer\NamespaceAnalyzer as RectorNamespaceAnalyzer;
use Rector\PhpParser\Node\BetterNodeFinder;
use Rector\Rector\AbstractRector;
abstract class AbstractValueObjectRemoverRector extends AbstractRector
abstract class AbstractObjectToScalarRector extends AbstractRector
{
/**
* @var string[]
@ -38,12 +37,12 @@ abstract class AbstractValueObjectRemoverRector extends AbstractRector
array $valueObjectsToSimpleTypes,
DocBlockAnalyzer $docBlockAnalyzer,
BetterNodeFinder $betterNodeFinder,
RectorNamespaceAnalyzer $rectorNamespaceAnalyzer
NamespaceAnalyzer $namespaceAnalyzer
) {
$this->valueObjectsToSimpleTypes = $valueObjectsToSimpleTypes;
$this->docBlockAnalyzer = $docBlockAnalyzer;
$this->betterNodeFinder = $betterNodeFinder;
$this->namespaceAnalyzer = $rectorNamespaceAnalyzer;
$this->namespaceAnalyzer = $namespaceAnalyzer;
}
protected function matchNewType(Node $node): ?string

23
packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/ValueObjectRemoverDocBlockRector.php → packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarDocBlockRector.php
View File

@ -1,6 +1,6 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Rector\ValueObjectRemover;
namespace Rector\DomainDrivenDesign\Rector\ObjectToScalar;
use PhpParser\Node;
use PhpParser\Node\Expr;
@ -13,7 +13,7 @@ use Rector\NodeTypeResolver\Node\Attribute;
use Rector\RectorDefinition\ConfiguredCodeSample;
use Rector\RectorDefinition\RectorDefinition;
final class ValueObjectRemoverDocBlockRector extends AbstractValueObjectRemoverRector
final class ObjectToScalarDocBlockRector extends AbstractObjectToScalarRector
{
public function getDefinition(): RectorDefinition
{
@ -24,6 +24,9 @@ final class ValueObjectRemoverDocBlockRector extends AbstractValueObjectRemoverR
* @var ValueObject|null
*/
private $name;
/** @var ValueObject|null */
$name;
CODE_SAMPLE
,
<<<'CODE_SAMPLE'
@ -31,21 +34,7 @@ CODE_SAMPLE
* @var string|null
*/
private $name;
CODE_SAMPLE
,
[
'$valueObjectsToSimpleTypes' => [
'ValueObject' => 'string',
],
]
),
new ConfiguredCodeSample(
<<<'CODE_SAMPLE'
/** @var ValueObject|null */
$name;
CODE_SAMPLE
,
<<<'CODE_SAMPLE'
/** @var string|null */
$name;
CODE_SAMPLE

47
packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/ValueObjectRemoverRector.php → packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarRector.php
View File

@ -1,6 +1,6 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Rector\ValueObjectRemover;
namespace Rector\DomainDrivenDesign\Rector\ObjectToScalar;
use PhpParser\Node;
use PhpParser\Node\Expr\New_;
@ -12,41 +12,26 @@ use Rector\NodeTypeResolver\Node\Attribute;
use Rector\RectorDefinition\ConfiguredCodeSample;
use Rector\RectorDefinition\RectorDefinition;
final class ValueObjectRemoverRector extends AbstractValueObjectRemoverRector
final class ObjectToScalarRector extends AbstractObjectToScalarRector
{
public function getDefinition(): RectorDefinition
{
return new RectorDefinition('Remove values objects and use directly the value.', [
new ConfiguredCodeSample(
'$name = new ValueObject("name");',
'$name = "name";',
[
'$valueObjectsToSimpleTypes' => [
'ValueObject' => 'string',
],
]
),
new ConfiguredCodeSample(
'function someFunction(ValueObject $name) { }',
'function someFunction(string $name) { }',
[
'$valueObjectsToSimpleTypes' => [
'ValueObject' => 'string',
],
]
),
new ConfiguredCodeSample(
'function someFunction(): ValueObject { }',
'function someFunction(): string { }',
[
'$valueObjectsToSimpleTypes' => [
'ValueObject' => 'string',
],
]
),
new ConfiguredCodeSample(
'function someFunction(): ?ValueObject { }',
'function someFunction(): ?string { }',
<<<'CODE_SAMPLE'
$name = new ValueObject("name");
function someFunction(ValueObject $name): ?ValueObject {
}
CODE_SAMPLE
,
<<<'CODE_SAMPLE'
$name = "name";
function someFunction(string $name): ?string {
}
CODE_SAMPLE
,
[
'$valueObjectsToSimpleTypes' => [
'ValueObject' => 'string',

8
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture.php.inc → packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture.php.inc
View File

@ -1,8 +1,8 @@
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Fixture;
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Fixture;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeChildOfValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeChildOfValueObject;
class FirstActionClass
{
@ -23,9 +23,9 @@ class FirstActionClass
-----
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Fixture;
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Fixture;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeChildOfValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeChildOfValueObject;
class FirstActionClass
{

8
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture2.php.inc → packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture2.php.inc
View File

@ -1,8 +1,8 @@
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Fixture;
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Fixture;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeValueObject;
class FourthActionClass
{
@ -17,9 +17,9 @@ class FourthActionClass
-----
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Fixture;
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Fixture;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeValueObject;
class FourthActionClass
{

35
packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture3.php.inc Normal file
View File

@ -0,0 +1,35 @@
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Fixture;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeValueObject;
class ThirdActionClass
{
/**
* @param null|SomeValueObject $name
*/
public function someFunction(?SomeValueObject $name): ?SomeValueObject
{
}
}
?>
-----
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Fixture;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeValueObject;
class ThirdActionClass
{
/**
* @param null|string $name
*/
public function someFunction(?SomeValueObject $name): ?SomeValueObject
{
}
}
?>

32
packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/ObjectToScalarDocBlockRectorTest.php Normal file
View File

@ -0,0 +1,32 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector;
use Rector\DomainDrivenDesign\Rector\ObjectToScalar\ObjectToScalarDocBlockRector;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeValueObject;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
final class ObjectToScalarDocBlockRectorTest extends AbstractRectorTestCase
{
public function test(): void
{
$this->doTestFiles([
__DIR__ . '/Fixture/fixture.php.inc',
__DIR__ . '/Fixture/fixture2.php.inc',
__DIR__ . '/Fixture/fixture3.php.inc',
]);
}
protected function getRectorClass(): string
{
return ObjectToScalarDocBlockRector::class;
}
/**
* @return mixed[]
*/
protected function getRectorConfiguration(): array
{
return [SomeValueObject::class => 'string'];
}
}

2
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Source/SomeChildOfValueObject.php → packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Source/SomeChildOfValueObject.php
View File

@ -1,6 +1,6 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source;
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source;
class SomeChildOfValueObject extends SomeValueObject
{

8
packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Source/SomeValueObject.php Normal file
View File

@ -0,0 +1,8 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source;
class SomeValueObject
{
}

8
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture.php.inc → packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture.php.inc
View File

@ -1,8 +1,8 @@
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector;
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source\SomeChildOfValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source\SomeChildOfValueObject;
class ActionClass
{
@ -23,9 +23,9 @@ class ActionClass
-----
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector;
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source\SomeChildOfValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source\SomeChildOfValueObject;
class ActionClass
{

2
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture2.php.inc → packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture2.php.inc
View File

@ -4,7 +4,7 @@ namespace SomeNamespace;
class SecondActionClass
{
public function someFunction(\Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source\SomeChildOfValueObject $name)
public function someFunction(\Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source\SomeChildOfValueObject $name)
{
}
}

4
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture3.php.inc → packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture3.php.inc
View File

@ -2,7 +2,7 @@
namespace SomeNamespace;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source\SomeValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source\SomeValueObject;
class ThirdActionClass
{
@ -20,7 +20,7 @@ class ThirdActionClass
namespace SomeNamespace;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source\SomeValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source\SomeValueObject;
class ThirdActionClass
{

4
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture4.php.inc → packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture4.php.inc
View File

@ -2,7 +2,7 @@
namespace SomeNamespace;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source\SomeValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source\SomeValueObject;
class FourthActionClass
{
@ -19,7 +19,7 @@ class FourthActionClass
namespace SomeNamespace;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source\SomeValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source\SomeValueObject;
class FourthActionClass
{

33
packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/ObjectToScalarRectorTest.php Normal file
View File

@ -0,0 +1,33 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector;
use Rector\DomainDrivenDesign\Rector\ObjectToScalar\ObjectToScalarRector;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source\SomeValueObject;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
final class ObjectToScalarRectorTest extends AbstractRectorTestCase
{
public function test(): void
{
$this->doTestFiles([
__DIR__ . '/Fixture/fixture.php.inc',
__DIR__ . '/Fixture/fixture2.php.inc',
__DIR__ . '/Fixture/fixture3.php.inc',
__DIR__ . '/Fixture/fixture4.php.inc',
]);
}
protected function getRectorClass(): string
{
return ObjectToScalarRector::class;
}
/**
* @return mixed[]
*/
protected function getRectorConfiguration(): array
{
return [SomeValueObject::class => 'string'];
}
}

2
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Source/SomeChildOfValueObject.php → packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Source/SomeChildOfValueObject.php
View File

@ -1,6 +1,6 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source;
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source;
class SomeChildOfValueObject extends SomeValueObject
{

8
packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Source/SomeValueObject.php Normal file
View File

@ -0,0 +1,8 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source;
class SomeValueObject
{
}

35
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture3.php.inc
View File

@ -1,35 +0,0 @@
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Fixture;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
class ThirdActionClass
{
/**
* @param null|SomeValueObject $name
*/
public function someFunction(?SomeValueObject $name): ?SomeValueObject
{
}
}
?>
-----
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Fixture;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
class ThirdActionClass
{
/**
* @param null|string $name
*/
public function someFunction(?SomeValueObject $name): ?SomeValueObject
{
}
}
?>

8
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Source/SomeValueObject.php
View File

@ -1,8 +0,0 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source;
class SomeValueObject
{
}

34
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/ValueObjectRemoverDocBlockRectorTest.php
View File

@ -1,34 +0,0 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector;
use Rector\DomainDrivenDesign\Rector\ValueObjectRemover\ValueObjectRemoverDocBlockRector;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
final class ValueObjectRemoverDocBlockRectorTest extends AbstractRectorTestCase
{
public function test(): void
{
$this->doTestFiles(
[
__DIR__ . '/Fixture/fixture.php.inc',
__DIR__ . '/Fixture/fixture2.php.inc',
__DIR__ . '/Fixture/fixture3.php.inc',
]
);
}
protected function getRectorClass(): string
{
return ValueObjectRemoverDocBlockRector::class;
}
/**
* @return mixed[]
*/
protected function getRectorConfiguration(): array
{
return [SomeValueObject::class => 'string'];
}
}

8
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Source/SomeValueObject.php
View File

@ -1,8 +0,0 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source;
class SomeValueObject
{
}

35
packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/ValueObjectRemoverRectorTest.php
View File

@ -1,35 +0,0 @@
<?php declare(strict_types=1);
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector;
use Rector\DomainDrivenDesign\Rector\ValueObjectRemover\ValueObjectRemoverRector;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source\SomeValueObject;
use Rector\Testing\PHPUnit\AbstractRectorTestCase;
final class ValueObjectRemoverRectorTest extends AbstractRectorTestCase
{
public function test(): void
{
$this->doTestFiles(
[
__DIR__ . '/Fixture/fixture.php.inc',
__DIR__ . '/Fixture/fixture2.php.inc',
__DIR__ . '/Fixture/fixture3.php.inc',
__DIR__ . '/Fixture/fixture4.php.inc',
]
);
}
protected function getRectorClass(): string
{
return ValueObjectRemoverRector::class;
}
/**
* @return mixed[]
*/
protected function getRectorConfiguration(): array
{
return [SomeValueObject::class => 'string'];
}
}

4
packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/PropertyTypeResolverTest.php
View File

@ -4,8 +4,8 @@ namespace Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\PropertyTypeResolver
use Iterator;
use PhpParser\Node\Stmt\Property;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeChildOfValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeChildOfValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeValueObject;
use Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\AbstractNodeTypeResolverTest;
use Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\PropertyTypeResolver\Source\ClassThatExtendsHtml;
use Rector\NodeTypeResolver\Tests\PerNodeTypeResolver\PropertyTypeResolver\Source\Html;

4
packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/Source/fixture.php
View File

@ -1,8 +1,8 @@
<?php
namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector;
namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector;
use Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source\SomeChildOfValueObject;
use Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source\SomeChildOfValueObject;
class ActionClass
{