Fix Return type Covariance Inverse Order (#1983)

Fix Return type Covariance Inverse Order
rectorphp · Sep 15, 2019 · 371322d · 371322d
2 parents 27ab83f + 82d2006
commit 371322d
Show file tree

Hide file tree

Showing 98 changed files with 562 additions and 509 deletions.
diff --git a/packages/CodeQuality/src/Rector/Foreach_/SimplifyForeachToCoalescingRector.php b/packages/CodeQuality/src/Rector/Foreach_/SimplifyForeachToCoalescingRector.php
@@ -12,6 +12,7 @@
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Return_;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\Php\ValueObject\PhpVersionFeature;
 use Rector\PhpParser\Node\Manipulator\ForeachManipulator;
 use Rector\Rector\AbstractRector;
 use Rector\RectorDefinition\CodeSample;
@@ -71,7 +72,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $this->isAtLeastPhpVersion('7.0')) {
+        if (! $this->isAtLeastPhpVersion(PhpVersionFeature::NULL_COALESCE)) {
             return null;
         }
 

diff --git a/...ges/CodeQuality/src/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php b/...ges/CodeQuality/src/Rector/If_/ConsecutiveNullCompareReturnsToNullCoalesceQueueRector.php
@@ -8,6 +8,7 @@
 use PhpParser\Node\Stmt\If_;
 use PhpParser\Node\Stmt\Return_;
 use Rector\NodeTypeResolver\Node\AttributeKey;
+use Rector\Php\ValueObject\PhpVersionFeature;
 use Rector\PhpParser\Node\Manipulator\IfManipulator;
 use Rector\Rector\AbstractRector;
 use Rector\RectorDefinition\CodeSample;
@@ -86,7 +87,7 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $this->isAtLeastPhpVersion('7.0')) {
+        if (! $this->isAtLeastPhpVersion(PhpVersionFeature::NULL_COALESCE)) {
             return null;
         }
 

diff --git a/...sts/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/SimplifyEmptyArrayCheckRectorTest.php b/...sts/Rector/BooleanAnd/SimplifyEmptyArrayCheckRector/SimplifyEmptyArrayCheckRectorTest.php
@@ -15,11 +15,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyEmptyArrayCheckRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -29,4 +24,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/fixture2.php.inc'];
         yield [__DIR__ . '/Fixture/fixture3.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyEmptyArrayCheckRector::class;
+    }
 }
diff --git a/...s/CodeQuality/tests/Rector/Foreach_/ForeachToInArrayRector/ForeachToInArrayRectorTest.php b/...s/CodeQuality/tests/Rector/Foreach_/ForeachToInArrayRector/ForeachToInArrayRectorTest.php
@@ -15,11 +15,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return ForeachToInArrayRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -31,4 +26,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/fixture4.php.inc'];
         yield [__DIR__ . '/Fixture/skip_collections.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return ForeachToInArrayRector::class;
+    }
 }
diff --git a/...ctor/Foreach_/SimplifyForeachToCoalescingRector/SimplifyForeachToCoalescingRectorTest.php b/...ctor/Foreach_/SimplifyForeachToCoalescingRector/SimplifyForeachToCoalescingRectorTest.php
@@ -15,11 +15,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyForeachToCoalescingRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -30,4 +25,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/fixture3.php.inc'];
         yield [__DIR__ . '/Fixture/foreach_key_value.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyForeachToCoalescingRector::class;
+    }
 }
diff --git a/...ArrayAndArrayKeysToArrayKeyExistsRector/InArrayAndArrayKeysToArrayKeyExistsRectorTest.php b/...ArrayAndArrayKeysToArrayKeyExistsRector/InArrayAndArrayKeysToArrayKeyExistsRectorTest.php
@@ -15,16 +15,16 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return InArrayAndArrayKeysToArrayKeyExistsRector::class;
-    }
-
     /**
      * @return string[]
      */
     public function provideDataForTest(): iterable
     {
         yield [__DIR__ . '/Fixture/fixture.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return InArrayAndArrayKeysToArrayKeyExistsRector::class;
+    }
 }
diff --git a/...sts/Rector/FuncCall/SimplifyFuncGetArgsCountRector/SimplifyFuncGetArgsCountRectorTest.php b/...sts/Rector/FuncCall/SimplifyFuncGetArgsCountRector/SimplifyFuncGetArgsCountRectorTest.php
@@ -15,16 +15,16 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyFuncGetArgsCountRector::class;
-    }
-
     /**
      * @return string[]
      */
     public function provideDataForTest(): iterable
     {
         yield [__DIR__ . '/Fixture/fixture.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyFuncGetArgsCountRector::class;
+    }
 }
diff --git a/...ity/tests/Rector/FuncCall/SimplifyInArrayValuesRector/SimplifyInArrayValuesRectorTest.php b/...ity/tests/Rector/FuncCall/SimplifyInArrayValuesRector/SimplifyInArrayValuesRectorTest.php
@@ -15,16 +15,16 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyInArrayValuesRector::class;
-    }
-
     /**
      * @return string[]
      */
     public function provideDataForTest(): iterable
     {
         yield [__DIR__ . '/Fixture/fixture.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyInArrayValuesRector::class;
+    }
 }
diff --git a/...Quality/tests/Rector/FuncCall/SimplifyStrposLowerRector/SimplifyStrposLowerRectorTest.php b/...Quality/tests/Rector/FuncCall/SimplifyStrposLowerRector/SimplifyStrposLowerRectorTest.php
@@ -15,16 +15,16 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyStrposLowerRector::class;
-    }
-
     /**
      * @return string[]
      */
     public function provideDataForTest(): iterable
     {
         yield [__DIR__ . '/Fixture/fixture.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyStrposLowerRector::class;
+    }
 }
diff --git a/...lity/tests/Rector/Identical/GetClassToInstanceOfRector/GetClassToInstanceOfRectorTest.php b/...lity/tests/Rector/Identical/GetClassToInstanceOfRector/GetClassToInstanceOfRectorTest.php
@@ -15,16 +15,16 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return GetClassToInstanceOfRector::class;
-    }
-
     /**
      * @return string[]
      */
     public function provideDataForTest(): iterable
     {
         yield [__DIR__ . '/Fixture/fixture.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return GetClassToInstanceOfRector::class;
+    }
 }
diff --git a/...uality/tests/Rector/Identical/SimplifyArraySearchRector/SimplifyArraySearchRectorTest.php b/...uality/tests/Rector/Identical/SimplifyArraySearchRector/SimplifyArraySearchRectorTest.php
@@ -15,11 +15,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyArraySearchRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -28,4 +23,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/fixture.php.inc'];
         yield [__DIR__ . '/Fixture/fixture2.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyArraySearchRector::class;
+    }
 }
diff --git a/...eQuality/tests/Rector/Identical/SimplifyConditionsRector/SimplifyConditionsRectorTest.php b/...eQuality/tests/Rector/Identical/SimplifyConditionsRector/SimplifyConditionsRectorTest.php
@@ -15,11 +15,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyConditionsRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -30,4 +25,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/fixture3.php.inc'];
         yield [__DIR__ . '/Fixture/dual_null.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyConditionsRector::class;
+    }
 }
diff --git a/...lity/tests/Rector/If_/SimplifyIfNotNullReturnRector/SimplifyIfNotNullReturnRectorTest.php b/...lity/tests/Rector/If_/SimplifyIfNotNullReturnRector/SimplifyIfNotNullReturnRectorTest.php
@@ -15,11 +15,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyIfNotNullReturnRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -29,4 +24,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/fixture2.php.inc'];
         yield [__DIR__ . '/Fixture/skip.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyIfNotNullReturnRector::class;
+    }
 }
diff --git a/...odeQuality/tests/Rector/If_/SimplifyIfReturnBoolRector/SimplifyIfReturnBoolRectorTest.php b/...odeQuality/tests/Rector/If_/SimplifyIfReturnBoolRector/SimplifyIfReturnBoolRectorTest.php
@@ -15,11 +15,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyIfReturnBoolRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -36,4 +31,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/fixture9.php.inc'];
         yield [__DIR__ . '/Fixture/fixture10.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyIfReturnBoolRector::class;
+    }
 }
diff --git a/.../tests/Rector/Return_/SimplifyUselessVariableRector/SimplifyUselessVariableRectorTest.php b/.../tests/Rector/Return_/SimplifyUselessVariableRector/SimplifyUselessVariableRectorTest.php
@@ -20,11 +20,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimplifyUselessVariableRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -36,4 +31,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/in_a_function.php.inc'];
         yield [__DIR__ . '/Fixture/keep_visual.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimplifyUselessVariableRector::class;
+    }
 }
diff --git a/...tor/Ternary/UnnecessaryTernaryExpressionRector/UnnecessaryTernaryExpressionRectorTest.php b/...tor/Ternary/UnnecessaryTernaryExpressionRector/UnnecessaryTernaryExpressionRectorTest.php
@@ -15,11 +15,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return UnnecessaryTernaryExpressionRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -30,4 +25,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/fixture3.php.inc'];
         yield [__DIR__ . '/Fixture/fixture4.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return UnnecessaryTernaryExpressionRector::class;
+    }
 }
diff --git a/...ctor/FuncCall/SimpleArrayCallableToStringRector/SimpleArrayCallableToStringRectorTest.php b/...ctor/FuncCall/SimpleArrayCallableToStringRector/SimpleArrayCallableToStringRectorTest.php
@@ -15,16 +15,16 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return SimpleArrayCallableToStringRector::class;
-    }
-
     /**
      * @return string[]
      */
     public function provideDataForTest(): iterable
     {
         yield [__DIR__ . '/Fixture/fixture.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return SimpleArrayCallableToStringRector::class;
+    }
 }
diff --git a/...ector/Identical/IdenticalFalseToBooleanNotRector/IdenticalFalseToBooleanNotRectorTest.php b/...ector/Identical/IdenticalFalseToBooleanNotRector/IdenticalFalseToBooleanNotRectorTest.php
@@ -15,11 +15,6 @@ public function test(string $file): void
         $this->doTestFile($file);
     }
 
-    public function getRectorClass(): string
-    {
-        return IdenticalFalseToBooleanNotRector::class;
-    }
-
     /**
      * @return string[]
      */
@@ -28,4 +23,9 @@ public function provideDataForTest(): iterable
         yield [__DIR__ . '/Fixture/fixture.php.inc'];
         yield [__DIR__ . '/Fixture/skip_null_false.php.inc'];
     }
+
+    protected function getRectorClass(): string
+    {
+        return IdenticalFalseToBooleanNotRector::class;
+    }
 }