From 2b29db08399cb5456da677af87bb3181e3297aec Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Fri, 14 Dec 2018 20:34:40 +0100
Subject: [PATCH] rename ValueObjectRemover*Rector to more propper
 ObjectToScalar*Rector

---
 .../AbstractObjectToScalarRector.php}         |  9 ++--
 .../ObjectToScalarDocBlockRector.php}         | 23 +++------
 .../ObjectToScalarRector.php}                 | 47 +++++++------------
 .../Fixture/fixture.php.inc                   |  8 ++--
 .../Fixture/fixture2.php.inc                  |  8 ++--
 .../Fixture/fixture3.php.inc                  | 35 ++++++++++++++
 .../ObjectToScalarDocBlockRectorTest.php      | 32 +++++++++++++
 .../Source/SomeChildOfValueObject.php         |  2 +-
 .../Source/SomeValueObject.php                |  8 ++++
 .../Fixture/fixture.php.inc                   |  8 ++--
 .../Fixture/fixture2.php.inc                  |  2 +-
 .../Fixture/fixture3.php.inc                  |  4 +-
 .../Fixture/fixture4.php.inc                  |  4 +-
 .../ObjectToScalarRectorTest.php              | 33 +++++++++++++
 .../Source/SomeChildOfValueObject.php         |  2 +-
 .../Source/SomeValueObject.php                |  8 ++++
 .../Fixture/fixture3.php.inc                  | 35 --------------
 .../Source/SomeValueObject.php                |  8 ----
 .../ValueObjectRemoverDocBlockRectorTest.php  | 34 --------------
 .../Source/SomeValueObject.php                |  8 ----
 .../ValueObjectRemoverRectorTest.php          | 35 --------------
 .../PropertyTypeResolverTest.php              |  4 +-
 .../PropertyTypeResolver/Source/fixture.php   |  4 +-
 23 files changed, 165 insertions(+), 196 deletions(-)
 rename packages/DomainDrivenDesign/src/Rector/{ValueObjectRemover/AbstractValueObjectRemoverRector.php => ObjectToScalar/AbstractObjectToScalarRector.php} (83%)
 rename packages/DomainDrivenDesign/src/Rector/{ValueObjectRemover/ValueObjectRemoverDocBlockRector.php => ObjectToScalar/ObjectToScalarDocBlockRector.php} (88%)
 rename packages/DomainDrivenDesign/src/Rector/{ValueObjectRemover/ValueObjectRemoverRector.php => ObjectToScalar/ObjectToScalarRector.php} (68%)
 rename packages/DomainDrivenDesign/tests/Rector/{ValueObjectRemoverDocBlockRector => ObjectToScalarDocBlockRector}/Fixture/fixture.php.inc (61%)
 rename packages/DomainDrivenDesign/tests/Rector/{ValueObjectRemoverDocBlockRector => ObjectToScalarDocBlockRector}/Fixture/fixture2.php.inc (55%)
 create mode 100644 packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture3.php.inc
 create mode 100644 packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/ObjectToScalarDocBlockRectorTest.php
 rename packages/DomainDrivenDesign/tests/Rector/{ValueObjectRemoverDocBlockRector => ObjectToScalarDocBlockRector}/Source/SomeChildOfValueObject.php (50%)
 create mode 100644 packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Source/SomeValueObject.php
 rename packages/DomainDrivenDesign/tests/Rector/{ValueObjectRemoverRector => ObjectToScalarRector}/Fixture/fixture.php.inc (63%)
 rename packages/DomainDrivenDesign/tests/Rector/{ValueObjectRemoverRector => ObjectToScalarRector}/Fixture/fixture2.php.inc (79%)
 rename packages/DomainDrivenDesign/tests/Rector/{ValueObjectRemoverRector => ObjectToScalarRector}/Fixture/fixture3.php.inc (68%)
 rename packages/DomainDrivenDesign/tests/Rector/{ValueObjectRemoverRector => ObjectToScalarRector}/Fixture/fixture4.php.inc (73%)
 create mode 100644 packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/ObjectToScalarRectorTest.php
 rename packages/DomainDrivenDesign/tests/Rector/{ValueObjectRemoverRector => ObjectToScalarRector}/Source/SomeChildOfValueObject.php (52%)
 create mode 100644 packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Source/SomeValueObject.php
 delete mode 100644 packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture3.php.inc
 delete mode 100644 packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Source/SomeValueObject.php
 delete mode 100644 packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/ValueObjectRemoverDocBlockRectorTest.php
 delete mode 100644 packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Source/SomeValueObject.php
 delete mode 100644 packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/ValueObjectRemoverRectorTest.php

diff --git a/packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/AbstractValueObjectRemoverRector.php b/packages/DomainDrivenDesign/src/Rector/ObjectToScalar/AbstractObjectToScalarRector.php
similarity index 83%
rename from packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/AbstractValueObjectRemoverRector.php
rename to packages/DomainDrivenDesign/src/Rector/ObjectToScalar/AbstractObjectToScalarRector.php
index bb566620682..5a0ed675dea 100644
--- a/packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/AbstractValueObjectRemoverRector.php
+++ b/packages/DomainDrivenDesign/src/Rector/ObjectToScalar/AbstractObjectToScalarRector.php
@@ -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
diff --git a/packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/ValueObjectRemoverDocBlockRector.php b/packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarDocBlockRector.php
similarity index 88%
rename from packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/ValueObjectRemoverDocBlockRector.php
rename to packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarDocBlockRector.php
index 3f236f5b325..779f1c48f0c 100644
--- a/packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/ValueObjectRemoverDocBlockRector.php
+++ b/packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarDocBlockRector.php
@@ -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
diff --git a/packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/ValueObjectRemoverRector.php b/packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarRector.php
similarity index 68%
rename from packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/ValueObjectRemoverRector.php
rename to packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarRector.php
index a80d555d579..0f2142aa786 100644
--- a/packages/DomainDrivenDesign/src/Rector/ValueObjectRemover/ValueObjectRemoverRector.php
+++ b/packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarRector.php
@@ -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',
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture.php.inc b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture.php.inc
similarity index 61%
rename from packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture.php.inc
rename to packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture.php.inc
index 8a3aa491824..2ed06d78684 100644
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture.php.inc
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture.php.inc
@@ -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
 {
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture2.php.inc b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture2.php.inc
similarity index 55%
rename from packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture2.php.inc
rename to packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture2.php.inc
index e84e9effef1..91e6a43e70e 100644
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture2.php.inc
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture2.php.inc
@@ -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
 {
diff --git a/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture3.php.inc b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture3.php.inc
new file mode 100644
index 00000000000..3b38ca808c1
--- /dev/null
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Fixture/fixture3.php.inc
@@ -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
+    {
+    }
+}
+
+?>
diff --git a/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/ObjectToScalarDocBlockRectorTest.php b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/ObjectToScalarDocBlockRectorTest.php
new file mode 100644
index 00000000000..e9cd929f689
--- /dev/null
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/ObjectToScalarDocBlockRectorTest.php
@@ -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'];
+    }
+}
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Source/SomeChildOfValueObject.php b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Source/SomeChildOfValueObject.php
similarity index 50%
rename from packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Source/SomeChildOfValueObject.php
rename to packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Source/SomeChildOfValueObject.php
index 554690e618a..3e1489638da 100644
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Source/SomeChildOfValueObject.php
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Source/SomeChildOfValueObject.php
@@ -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
 {
diff --git a/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Source/SomeValueObject.php b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Source/SomeValueObject.php
new file mode 100644
index 00000000000..05cf636f437
--- /dev/null
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarDocBlockRector/Source/SomeValueObject.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarDocBlockRector\Source;
+
+class SomeValueObject
+{
+
+}
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture.php.inc b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture.php.inc
similarity index 63%
rename from packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture.php.inc
rename to packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture.php.inc
index 73aa8276ee0..bcc6e65178a 100644
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture.php.inc
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture.php.inc
@@ -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
 {
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture2.php.inc b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture2.php.inc
similarity index 79%
rename from packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture2.php.inc
rename to packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture2.php.inc
index 99e53386ff6..263b5b2022e 100644
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture2.php.inc
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture2.php.inc
@@ -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)
     {
     }
 }
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture3.php.inc b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture3.php.inc
similarity index 68%
rename from packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture3.php.inc
rename to packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture3.php.inc
index d3ead9f5430..fc2e3c53e28 100644
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture3.php.inc
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture3.php.inc
@@ -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
 {
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture4.php.inc b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture4.php.inc
similarity index 73%
rename from packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture4.php.inc
rename to packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture4.php.inc
index 8719f548cbd..ba5d39d5f3e 100644
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Fixture/fixture4.php.inc
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Fixture/fixture4.php.inc
@@ -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
 {
diff --git a/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/ObjectToScalarRectorTest.php b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/ObjectToScalarRectorTest.php
new file mode 100644
index 00000000000..6ab5b9f28ea
--- /dev/null
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/ObjectToScalarRectorTest.php
@@ -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'];
+    }
+}
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Source/SomeChildOfValueObject.php b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Source/SomeChildOfValueObject.php
similarity index 52%
rename from packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Source/SomeChildOfValueObject.php
rename to packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Source/SomeChildOfValueObject.php
index 98fbb5181de..620e5cd5a82 100644
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Source/SomeChildOfValueObject.php
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Source/SomeChildOfValueObject.php
@@ -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
 {
diff --git a/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Source/SomeValueObject.php b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Source/SomeValueObject.php
new file mode 100644
index 00000000000..76a62bd76c6
--- /dev/null
+++ b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/Source/SomeValueObject.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Rector\DomainDrivenDesign\Tests\Rector\ObjectToScalarRector\Source;
+
+class SomeValueObject
+{
+
+}
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture3.php.inc b/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture3.php.inc
deleted file mode 100644
index c9d335260b8..00000000000
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Fixture/fixture3.php.inc
+++ /dev/null
@@ -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
-    {
-    }
-}
-
-?>
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Source/SomeValueObject.php b/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Source/SomeValueObject.php
deleted file mode 100644
index 8bae2097a53..00000000000
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/Source/SomeValueObject.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverDocBlockRector\Source;
-
-class SomeValueObject
-{
-
-}
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/ValueObjectRemoverDocBlockRectorTest.php b/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/ValueObjectRemoverDocBlockRectorTest.php
deleted file mode 100644
index 4b7b9c96618..00000000000
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverDocBlockRector/ValueObjectRemoverDocBlockRectorTest.php
+++ /dev/null
@@ -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'];
-    }
-}
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Source/SomeValueObject.php b/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Source/SomeValueObject.php
deleted file mode 100644
index 5af135dd7ad..00000000000
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/Source/SomeValueObject.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Rector\DomainDrivenDesign\Tests\Rector\ValueObjectRemoverRector\Source;
-
-class SomeValueObject
-{
-
-}
diff --git a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/ValueObjectRemoverRectorTest.php b/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/ValueObjectRemoverRectorTest.php
deleted file mode 100644
index ee124328b0e..00000000000
--- a/packages/DomainDrivenDesign/tests/Rector/ValueObjectRemoverRector/ValueObjectRemoverRectorTest.php
+++ /dev/null
@@ -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'];
-    }
-}
diff --git a/packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/PropertyTypeResolverTest.php b/packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/PropertyTypeResolverTest.php
index 52f6768cc01..6fff3b8b5f0 100644
--- a/packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/PropertyTypeResolverTest.php
+++ b/packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/PropertyTypeResolverTest.php
@@ -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;
diff --git a/packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/Source/fixture.php b/packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/Source/fixture.php
index 0de88a86861..c88f485606e 100644
--- a/packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/Source/fixture.php
+++ b/packages/NodeTypeResolver/tests/PerNodeTypeResolver/PropertyTypeResolver/Source/fixture.php
@@ -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
 {