Merge pull request #96 from jrushlow/bump/dev-depends

[dev] stops using doctrine common ns in test suite
SymfonyCasts · Apr 17, 2020 · 6aaceb2 · 6aaceb2
2 parents 61e1e4b + 7611db3
commit 6aaceb2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         "symfony/framework-bundle": "^4.4 | ^5.0",
         "symfony/phpunit-bridge": "^5.0",
         "vimeo/psalm": "^3.8",
-        "doctrine/doctrine-bundle": "^2.0"
+        "doctrine/doctrine-bundle": "^2.0.3"
     },
     "conflict": {
         "doctrine/orm": "<2.7",

diff --git a/tests/Fixtures/AbstractResetPasswordTestKernel.php b/tests/Fixtures/AbstractResetPasswordTestKernel.php
@@ -90,7 +90,7 @@ protected function configureContainer(ContainerBuilder $container, LoaderInterfa
                     'App' => [
                         'is_bundle' => false,
                         'type' => 'annotation',
-                        'dir' => '%kernel.project_dir%/tests/Fixtures/Entity/',
+                        'dir' => 'tests/Fixtures/Entity/',
                         'prefix' => 'SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity',
                         'alias' => 'App',
                     ],

diff --git a/tests/Fixtures/ResetPasswordTestFixtureRequestRepository.php b/tests/Fixtures/ResetPasswordTestFixtureRequestRepository.php
@@ -10,7 +10,7 @@
 namespace SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures;
 
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
-use Doctrine\Common\Persistence\ManagerRegistry;
+use Doctrine\Persistence\ManagerRegistry;
 use SymfonyCasts\Bundle\ResetPassword\Model\ResetPasswordRequestInterface;
 use SymfonyCasts\Bundle\ResetPassword\Persistence\Repository\ResetPasswordRequestRepositoryTrait;
 use SymfonyCasts\Bundle\ResetPassword\Persistence\ResetPasswordRequestRepositoryInterface;

diff --git a/tests/FunctionalTests/Command/ResetPasswordRemoveExpiredCommandTest.php b/tests/FunctionalTests/Command/ResetPasswordRemoveExpiredCommandTest.php
@@ -11,6 +11,7 @@
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\ORM\Tools\SchemaTool;
+use Doctrine\Persistence\ObjectManager;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\CommandLoader\CommandLoaderInterface;
@@ -27,7 +28,7 @@
 final class ResetPasswordRemoveExpiredCommandTest extends TestCase
 {
     /**
-     * @var \Doctrine\Common\Persistence\ObjectManager|object
+     * @var ObjectManager|object
      */
     private $manager;
 

diff --git a/tests/FunctionalTests/Persistence/ResetPasswordRequestRepositoryTest.php b/tests/FunctionalTests/Persistence/ResetPasswordRequestRepositoryTest.php
@@ -11,6 +11,7 @@
 
 use Doctrine\Bundle\DoctrineBundle\Registry;
 use Doctrine\ORM\Tools\SchemaTool;
+use Doctrine\Persistence\ObjectManager;
 use PHPUnit\Framework\TestCase;
 use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\AbstractResetPasswordTestKernel;
 use SymfonyCasts\Bundle\ResetPassword\Tests\Fixtures\Entity\ResetPasswordTestFixtureRequest;
@@ -26,7 +27,7 @@
 final class ResetPasswordRequestRepositoryTest extends TestCase
 {
     /**
-     * @var \Doctrine\Common\Persistence\ObjectManager|object
+     * @var ObjectManager|object
      */
     private $manager;
 

diff --git a/tests/UnitTests/Controller/ResetPasswordControllerTraitTest.php b/tests/UnitTests/Controller/ResetPasswordControllerTraitTest.php
@@ -27,7 +27,7 @@ class ResetPasswordControllerTraitTest extends TestCase
     private const TOKEN_KEY = 'ResetPasswordPublicToken';
 
     /**
-     * @var \PHPUnit\Framework\MockObject\MockObject|SessionInterface
+     * @var MockObject|SessionInterface
      */
     private $mockSession;