fix cs

rectorphp · Apr 28, 2019 · 3c2ff06 · 3c2ff06
1 parent 6c3c75c
commit 3c2ff06
Show file tree

Hide file tree

Showing 84 changed files with 494 additions and 385 deletions.
diff --git a/packages/CakePHP/tests/Rector/MethodCall/ModalToGetSetRector/ModalToGetSetRectorTest.php b/packages/CakePHP/tests/Rector/MethodCall/ModalToGetSetRector/ModalToGetSetRectorTest.php
@@ -28,19 +28,21 @@ protected function getRectorClass(): string
     protected function getRectorConfiguration(): array
     {
         return [
-            SomeModelType::class => [
-                'config' => [
-                    'get' => 'getConfig',
-                    'minimal_argument_count' => 2,
-                    'first_argument_type_to_set' => 'array',
+            '$methodNamesByTypes' => [
+                SomeModelType::class => [
+                    'config' => [
+                        'get' => 'getConfig',
+                        'minimal_argument_count' => 2,
+                        'first_argument_type_to_set' => 'array',
+                    ],
+                    'customMethod' => [
+                        'get' => 'customMethodGetName',
+                        'set' => 'customMethodSetName',
+                        'minimal_argument_count' => 2,
+                        'first_argument_type_to_set' => 'array',
+                    ],
+                    'method' => null,
                 ],
-                'customMethod' => [
-                    'get' => 'customMethodGetName',
-                    'set' => 'customMethodSetName',
-                    'minimal_argument_count' => 2,
-                    'first_argument_type_to_set' => 'array',
-                ],
-                'method' => null,
             ],
         ];
     }

diff --git a/packages/CodingStyle/src/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php b/packages/CodingStyle/src/Rector/ClassMethod/ReturnArrayClassMethodToYieldRector.php
@@ -41,13 +41,13 @@ final class ReturnArrayClassMethodToYieldRector extends AbstractRector
      * @param string[][] $methodsByType
      */
     public function __construct(
-        array $methodsByType = [],
         NodeTransformer $nodeTransformer,
-        DocBlockManipulator $docBlockManipulator
+        DocBlockManipulator $docBlockManipulator,
+        array $methodsByType = []
     ) {
-        $this->methodsByType = $methodsByType;
         $this->nodeTransformer = $nodeTransformer;
         $this->docBlockManipulator = $docBlockManipulator;
+        $this->methodsByType = $methodsByType;
     }
 
     public function getDefinition(): RectorDefinition

diff --git a/packages/CodingStyle/src/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php b/packages/CodingStyle/src/Rector/ClassMethod/YieldClassMethodToArrayClassMethodRector.php
@@ -32,7 +32,7 @@ final class YieldClassMethodToArrayClassMethodRector extends AbstractRector
     /**
      * @param string[][] $methodsByType
      */
-    public function __construct(array $methodsByType = [], NodeTransformer $nodeTransformer)
+    public function __construct(NodeTransformer $nodeTransformer, array $methodsByType = [])
     {
         $this->methodsByType = $methodsByType;
         $this->nodeTransformer = $nodeTransformer;

diff --git a/...assMethod/ReturnArrayClassMethodToYieldRector/ReturnArrayClassMethodToYieldRectorTest.php b/...assMethod/ReturnArrayClassMethodToYieldRector/ReturnArrayClassMethodToYieldRectorTest.php
@@ -27,13 +27,15 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return string[]
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {
         return [
-            EventSubscriberInterface::class => ['getSubscribedEvents'],
-            ParentTestCase::class => ['#(provide|dataProvider)*#'],
+            '$methodsByType' => [
+                EventSubscriberInterface::class => ['getSubscribedEvents'],
+                ParentTestCase::class => ['#(provide|dataProvider)*#'],
+            ],
         ];
     }
 }
diff --git a/...YieldClassMethodToArrayClassMethodRector/YieldClassMethodToArrayClassMethodRectorTest.php b/...YieldClassMethodToArrayClassMethodRector/YieldClassMethodToArrayClassMethodRectorTest.php
@@ -19,12 +19,14 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return string[]
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {
         return [
-            EventSubscriberInterface::class => ['getSubscribedEvents'],
+            '$methodsByType' => [
+                EventSubscriberInterface::class => ['getSubscribedEvents'],
+            ],
         ];
     }
 }
diff --git a/packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarDocBlockRector.php b/packages/DomainDrivenDesign/src/Rector/ObjectToScalar/ObjectToScalarDocBlockRector.php
@@ -14,14 +14,6 @@
 
 final class ObjectToScalarDocBlockRector extends AbstractObjectToScalarRector
 {
-    /**
-     * @param string[] $valueObjectsToSimpleTypes
-     */
-    public function __construct(array $valueObjectsToSimpleTypes = [])
-    {
-        parent::__construct($valueObjectsToSimpleTypes);
-    }
-
     public function getDefinition(): RectorDefinition
     {
         return new RectorDefinition('Turns defined value object to simple types in doc blocks', [

diff --git a/...ivenDesign/tests/Rector/ObjectToScalarDocBlockRector/ObjectToScalarDocBlockRectorTest.php b/...ivenDesign/tests/Rector/ObjectToScalarDocBlockRector/ObjectToScalarDocBlockRectorTest.php
@@ -27,6 +27,10 @@ protected function getRectorClass(): string
      */
     protected function getRectorConfiguration(): array
     {
-        return [SomeValueObject::class => 'string'];
+        return [
+            '$valueObjectsToSimpleTypes' => [
+                SomeValueObject::class => 'string',
+            ],
+        ];
     }
 }
diff --git a/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/ObjectToScalarRectorTest.php b/packages/DomainDrivenDesign/tests/Rector/ObjectToScalarRector/ObjectToScalarRectorTest.php
@@ -28,6 +28,10 @@ protected function getRectorClass(): string
      */
     protected function getRectorConfiguration(): array
     {
-        return [SomeValueObject::class => 'string'];
+        return [
+            '$valueObjectsToSimpleTypes' => [
+                SomeValueObject::class => 'string',
+            ],
+        ];
     }
 }
diff --git a/...ges/Jms/tests/Rector/Property/JmsInjectAnnotationRector/JmsInjectAnnotationRectorTest.php b/...ges/Jms/tests/Rector/Property/JmsInjectAnnotationRector/JmsInjectAnnotationRectorTest.php
@@ -2,10 +2,21 @@
 
 namespace Rector\Jms\Tests\Rector\Property\JmsInjectAnnotationRector;
 
+use Rector\Jms\Rector\Property\JmsInjectAnnotationRector;
+use Rector\Symfony\Tests\FrameworkBundle\AbstractToConstructorInjectionRectorSource\SomeKernelClass;
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+use Symplify\PackageBuilder\Parameter\ParameterProvider;
 
 final class JmsInjectAnnotationRectorTest extends AbstractRectorTestCase
 {
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $parameterProvider = self::$container->get(ParameterProvider::class);
+        $parameterProvider->changeParameter('kernel_class', SomeKernelClass::class);
+    }
+
     public function test(): void
     {
         $this->doTestFiles([
@@ -17,8 +28,8 @@ public function test(): void
         ]);
     }
 
-    protected function provideConfig(): string
+    protected function getRectorClass(): string
     {
-        return __DIR__ . '/config.yaml';
+        return JmsInjectAnnotationRector::class;
     }
 }
diff --git a/...sts/Rector/StaticCall/MinutesToSecondsInCacheRector/MinutesToSecondsInCacheRectorTest.php b/...sts/Rector/StaticCall/MinutesToSecondsInCacheRector/MinutesToSecondsInCacheRectorTest.php
@@ -19,7 +19,7 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return mixed[]|null
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {

diff --git a/...lass_/NetteControlToSymfonyControllerRector/NetteControlToSymfonyControllerRectorTest.php b/...lass_/NetteControlToSymfonyControllerRector/NetteControlToSymfonyControllerRectorTest.php
@@ -19,7 +19,7 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return string[]|null
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {

diff --git a/...ony/tests/Rector/Class_/NetteFormToSymfonyFormRector/NetteFormToSymfonyFormRectorTest.php b/...ony/tests/Rector/Class_/NetteFormToSymfonyFormRector/NetteFormToSymfonyFormRectorTest.php
@@ -19,7 +19,7 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return mixed[]|null
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {

diff --git a/...HttpRequestGetHeaderToHeadersGetRector/FromHttpRequestGetHeaderToHeadersGetRectorTest.php b/...HttpRequestGetHeaderToHeadersGetRector/FromHttpRequestGetHeaderToHeadersGetRectorTest.php
@@ -19,7 +19,7 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return mixed[]|null
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {

diff --git a/...estGetParameterToAttributesGetRector/FromRequestGetParameterToAttributesGetRectorTest.php b/...estGetParameterToAttributesGetRector/FromRequestGetParameterToAttributesGetRectorTest.php
@@ -19,7 +19,7 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return mixed[]|null
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {

diff --git a/...tests/Rector/MethodCall/WrapTransParameterNameRector/WrapTransParameterNameRectorTest.php b/...tests/Rector/MethodCall/WrapTransParameterNameRector/WrapTransParameterNameRectorTest.php
@@ -19,7 +19,7 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return mixed[]|null
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {

diff --git a/packages/Php/tests/Rector/ConstFetch/RenameConstantRector/RenameConstantRectorTest.php b/packages/Php/tests/Rector/ConstFetch/RenameConstantRector/RenameConstantRectorTest.php
@@ -18,13 +18,15 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return string[][]
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {
         return [
-            'MYSQL_ASSOC' => 'MYSQLI_ASSOC',
-            'OLD_CONSTANT' => 'NEW_CONSTANT',
+            '$oldToNewConstants' => [
+                'MYSQL_ASSOC' => 'MYSQLI_ASSOC',
+                'OLD_CONSTANT' => 'NEW_CONSTANT',
+            ],
         ];
     }
 }
diff --git a/...Php/tests/Rector/FuncCall/SwapFuncCallArgumentsRector/SwapFuncCallArgumentsRectorTest.php b/...Php/tests/Rector/FuncCall/SwapFuncCallArgumentsRector/SwapFuncCallArgumentsRectorTest.php
@@ -18,12 +18,14 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return mixed[]|null
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {
         return [
-            'some_function' => [1, 0],
+            '$newArgumentPositionsByFunctionName' => [
+                'some_function' => [1, 0],
+            ],
         ];
     }
 }
diff --git a/...ctor/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php b/...ctor/MethodCall/PreferThisOrSelfMethodCallRector/PreferThisOrSelfMethodCallRectorTest.php
@@ -25,8 +25,10 @@ protected function getRectorClass(): string
     protected function getRectorConfiguration(): array
     {
         return [
-            AbstractTestCase::class => 'self',
-            BeLocalClass::class => 'this',
+            '$typeToPreference' => [
+                AbstractTestCase::class => 'self',
+                BeLocalClass::class => 'this',
+            ],
         ];
     }
 }
diff --git a/packages/Php/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php b/packages/Php/tests/Rector/Name/ReservedObjectRector/ReservedObjectRectorTest.php
@@ -22,6 +22,10 @@ protected function getRectorClass(): string
      */
     protected function getRectorConfiguration(): array
     {
-        return ['ReservedObject' => 'SmartObject'];
+        return [
+            '$reservedKeywordsToReplacements' => [
+                'ReservedObject' => 'SmartObject',
+            ],
+        ];
     }
 }
diff --git a/...hpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/Fixture/custom_matcher.php.inc b/...hpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/Fixture/custom_matcher.php.inc
@@ -63,14 +63,14 @@ use Rector\PhpSpecToPHPUnit\Tests\Rector\Class_\PhpSpecToPHPUnitRector\Source\Du
 
 class RatesTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var Provider|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $provider;
     /**
      * @var \Rector\PhpSpecToPHPUnit\Tests\Rector\MethodCall\PhpSpecToPHPUnitRector\Fixture\Rates
      */
     private $rates;
+    /**
+     * @var Provider|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $provider;
     protected function setUp()
     {
         $this->provider = $this->createMock(Provider::class);

diff --git a/...pSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/Fixture/let_create_edge.php.inc b/...pSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/Fixture/let_create_edge.php.inc
@@ -32,14 +32,14 @@ use Rector\PhpSpecToPHPUnit\Tests\Rector\Class_\PhpSpecToPHPUnitRector\Source\Du
 
 class CurrencyTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var CurrencyData|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $data;
     /**
      * @var \Rector\PhpSpecToPHPUnit\Tests\Rector\Class_\PhpSpecToPHPUnitRector\Fixture\Currency
      */
     private $currency;
+    /**
+     * @var CurrencyData|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $data;
     protected function setUp()
     {
         $this->data = $this->createMock(CurrencyData::class);

diff --git a/...pSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/Fixture/mock_properties.php.inc b/...pSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/Fixture/mock_properties.php.inc
@@ -28,14 +28,14 @@ use Rector\PhpSpecToPHPUnit\Tests\Rector\Class_\PhpSpecToPHPUnitRector\Source\Du
 
 class MockPropertiesTest extends \PHPUnit\Framework\TestCase
 {
-    /**
-     * @var OrderFactory|\PHPUnit\Framework\MockObject\MockObject
-     */
-    private $factory;
     /**
      * @var \Rector\PhpSpecToPHPUnit\Tests\Rector\MethodCall\PhpSpecToPHPUnitRector\Fixture\MockProperties
      */
     private $mockProperties;
+    /**
+     * @var OrderFactory|\PHPUnit\Framework\MockObject\MockObject
+     */
+    private $factory;
     protected function setUp()
     {
         $this->factory = $this->createMock(OrderFactory::class);

diff --git a/...hpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/PhpSpecToPHPUnitRectorTest.php b/...hpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/PhpSpecToPHPUnitRectorTest.php
@@ -4,15 +4,6 @@
 
 use Rector\Testing\PHPUnit\AbstractRectorTestCase;
 
-/**
- * @covers \Rector\PhpSpecToPHPUnit\Rector\MethodCall\PhpSpecMocksToPHPUnitMocksRector
- * @covers \Rector\PhpSpecToPHPUnit\Rector\MethodCall\PhpSpecPromisesToPHPUnitAssertRector
- *
- * @covers \Rector\PhpSpecToPHPUnit\Rector\ClassMethod\PhpSpecMethodToPHPUnitMethodRector
- *
- * @covers \Rector\PhpSpecToPHPUnit\Rector\Class_\PhpSpecClassToPHPUnitClassRector
- * @covers \Rector\PhpSpecToPHPUnit\Rector\Class_\AddMockPropertiesRector
- */
 final class PhpSpecToPHPUnitRectorTest extends AbstractRectorTestCase
 {
     public function test(): void

diff --git a/packages/PhpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/config.yaml b/packages/PhpSpecToPHPUnit/tests/Rector/Class_/PhpSpecToPHPUnitRector/config.yaml
@@ -1,15 +1,6 @@
+imports:
+    - { resource: '../../../../../../config/level/framework-migration/phpspec-to-phpunit.yaml' }
+
 parameters:
     # for tests only
     object_behavior_class: 'Rector\PhpSpecToPHPUnit\Tests\Rector\Class_\PhpSpecToPHPUnitRector\Source\DummyObjectBehavior'
-
-services:
-    # order matters
-    Rector\PhpSpecToPHPUnit\Rector\MethodCall\PhpSpecMocksToPHPUnitMocksRector: ~
-    Rector\PhpSpecToPHPUnit\Rector\MethodCall\PhpSpecPromisesToPHPUnitAssertRector: ~
-
-    Rector\PhpSpecToPHPUnit\Rector\ClassMethod\PhpSpecMethodToPHPUnitMethodRector: ~
-
-    Rector\PhpSpecToPHPUnit\Rector\Class_\AddMockPropertiesRector: ~
-    Rector\PhpSpecToPHPUnit\Rector\Class_\PhpSpecClassToPHPUnitClassRector: ~
-
-    Rector\PhpSpecToPHPUnit\Rector\ClassMethod\MockVariableToPropertyFetchRector: ~
diff --git a/...Rector/Class_/StaticTypeToSetterInjectionRector/StaticTypeToSetterInjectionRectorTest.php b/...Rector/Class_/StaticTypeToSetterInjectionRector/StaticTypeToSetterInjectionRectorTest.php
@@ -25,7 +25,7 @@ protected function getRectorClass(): string
     }
 
     /**
-     * @return string[]
+     * @return mixed[]
      */
     protected function getRectorConfiguration(): array
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,7 @@ protected function getRectorClass(): string @@
         }
         /**
-         * @return mixed[]|null
+         * @return mixed[]
          */
         protected function getRectorConfiguration(): array
         {
@@ Expand Down @@