fix tests

rectorphp · Feb 6, 2019 · e540e60 · e540e60
1 parent ec68ae0
commit e540e60
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "ocramius/package-versions": "^1.3",
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^7.5|^8.0",
         "symplify/easy-coding-standard": "^5.4.2",
         "friendsofphp/php-cs-fixer": "^2.14",
         "symplify/monorepo-builder": "^5.4.2",

diff --git a/packages/Doctrine/src/Rector/AliasToClassRector.php b/packages/Doctrine/src/Rector/AliasToClassRector.php
@@ -24,8 +24,10 @@ final class AliasToClassRector extends AbstractRector
     /**
      * @param string[] $aliasesToNamespaces
      */
-    public function __construct(array $aliasesToNamespaces, string $entityManagerClass = 'Doctrine\ORM\EntityManagerInterface')
-    {
+    public function __construct(
+        array $aliasesToNamespaces,
+        string $entityManagerClass = 'Doctrine\ORM\EntityManagerInterface'
+    ) {
         $this->aliasesToNamespaces = $aliasesToNamespaces;
         $this->entityManagerClass = $entityManagerClass;
     }

diff --git a/packages/Doctrine/tests/Rector/AliasToClassRector/AliasToClassRectorTest.php b/packages/Doctrine/tests/Rector/AliasToClassRector/AliasToClassRectorTest.php
@@ -27,7 +27,7 @@ protected function getRectorConfiguration(): array
             '$aliasesToNamespaces' => [
                 'App' => 'App\Entity',
             ],
-            '$entityManagerClass' => DoctrineEntityManager::class
+            '$entityManagerClass' => DoctrineEntityManager::class,
         ];
     }
 }
diff --git a/packages/Sylius/src/Rector/Review/ReplaceCreateMethodWithoutReviewerRector.php b/packages/Sylius/src/Rector/Review/ReplaceCreateMethodWithoutReviewerRector.php
@@ -12,6 +12,17 @@
 
 final class ReplaceCreateMethodWithoutReviewerRector extends AbstractRector
 {
+    /**
+     * @var string
+     */
+    private $reviewFactoryInterface;
+
+    public function __construct(
+        string $reviewFactoryInterface = 'Sylius\Component\Review\Factory\ReviewFactoryInterface'
+    ) {
+        $this->reviewFactoryInterface = $reviewFactoryInterface;
+    }
+
     public function getDefinition(): RectorDefinition
     {
         return new RectorDefinition(
@@ -38,6 +49,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        if (! $this->isType($node, $this->reviewFactoryInterface)) {
+            return null;
+        }
+
         if (! $this->isName($node, 'createForSubjectWithReviewer')) {
             return null;
         }

diff --git a/packages/Sylius/tests/Rector/Review/Fixture/fixture.php.inc b/packages/Sylius/tests/Rector/Review/Fixture/fixture.php.inc
@@ -2,10 +2,12 @@
 
 namespace Rector\Sylius\Tests\Rector\Review\Fixture;
 
+use Rector\Sylius\Tests\Rector\Review\Source\ReviewFactoryInterface;
+
 class SomeClass
 {
     /**
-     * @var \Sylius\Component\Review\Factory\ReviewFactoryInterface
+     * @var ReviewFactoryInterface
      */
     private $reviewFactory;
 
@@ -21,10 +23,12 @@ class SomeClass
 
 namespace Rector\Sylius\Tests\Rector\Review\Fixture;
 
+use Rector\Sylius\Tests\Rector\Review\Source\ReviewFactoryInterface;
+
 class SomeClass
 {
     /**
-     * @var \Sylius\Component\Review\Factory\ReviewFactoryInterface
+     * @var ReviewFactoryInterface
      */
     private $reviewFactory;
 

diff --git a/packages/Sylius/tests/Rector/Review/Fixture/fixture2.php.inc b/packages/Sylius/tests/Rector/Review/Fixture/fixture2.php.inc
@@ -2,10 +2,12 @@
 
 namespace Rector\Sylius\Tests\Rector\Review\Fixture;
 
+use Rector\Sylius\Tests\Rector\Review\Source\ReviewFactoryInterface;
+
 class SomeClass2
 {
     /**
-     * @var \Sylius\Component\Review\Factory\ReviewFactoryInterface
+     * @var ReviewFactoryInterface
      */
     private $reviewFactory;
 
@@ -21,10 +23,12 @@ class SomeClass2
 
 namespace Rector\Sylius\Tests\Rector\Review\Fixture;
 
+use Rector\Sylius\Tests\Rector\Review\Source\ReviewFactoryInterface;
+
 class SomeClass2
 {
     /**
-     * @var \Sylius\Component\Review\Factory\ReviewFactoryInterface
+     * @var ReviewFactoryInterface
      */
     private $reviewFactory;
 

diff --git a/packages/Sylius/tests/Rector/Review/ReplaceCreateMethodWithoutReviewerRectorTest.php b/packages/Sylius/tests/Rector/Review/ReplaceCreateMethodWithoutReviewerRectorTest.php
@@ -16,4 +16,11 @@ public function getRectorClass(): string
     {
         return ReplaceCreateMethodWithoutReviewerRector::class;
     }
+
+    protected function getRectorConfiguration(): ?array
+    {
+        return [
+            '$reviewFactoryInterface' => \Rector\Sylius\Tests\Rector\Review\Source\ReviewFactoryInterface::class
+        ];
+    }
 }
diff --git a/packages/Sylius/tests/Rector/Review/Source/ReviewFactoryInterface.php b/packages/Sylius/tests/Rector/Review/Source/ReviewFactoryInterface.php
@@ -0,0 +1,8 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Sylius\Tests\Rector\Review\Source;
+
+interface ReviewFactoryInterface
+{
+
+}