Ensures managers are not shared within tests

bin/doctrine_purge

@@ -11,10 +11,14 @@
  */
 
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
+use Doctrine\ORM\EntityManagerInterface;
 
 require_once __DIR__.'/../tests/Bridge/Doctrine/autoload.php';
 
-$purger = new ORMPurger($GLOBALS['entityManager']);
+/** @var EntityManagerInterface $entityManager */
+$entityManager = $GLOBALS['entityManager'];
+
+$purger = new ORMPurger($entityManager);
 $purger->purge();
 
 return 1;

bin/eloquent_migrate

@@ -10,6 +10,17 @@
  * file that was distributed with this source code.
  */
 
+use Illuminate\Database\Capsule\Manager;
+use Illuminate\Database\Migrations\MigrationRepositoryInterface;
+use Illuminate\Database\Migrations\Migrator;
+
 require_once __DIR__.'/../tests/Bridge/Eloquent/autoload.php';
 
-$GLOBALS['migrator']->run('migrations');
+/**
+ * @var Manager $manager
+ * @var MigrationRepositoryInterface $repository
+ * @var Migrator $migrator
+ */
+[$manager, $repository, $migrator] = $GLOBALS['manager_repository_migrator_factory']();
+
+$migrator->run('migrations');

bin/eloquent_rollback

@@ -10,6 +10,17 @@
  * file that was distributed with this source code.
  */
 
+use Illuminate\Database\Capsule\Manager;
+use Illuminate\Database\Migrations\MigrationRepositoryInterface;
+use Illuminate\Database\Migrations\Migrator;
+
 require_once __DIR__.'/../tests/Bridge/Eloquent/autoload.php';
 
-$GLOBALS['migrator']->rollback();
+/**
+ * @var Manager $manager
+ * @var MigrationRepositoryInterface $repository
+ * @var Migrator $migrator
+ */
+[$manager, $repository, $migrator] = $GLOBALS['manager_repository_migrator_factory']();
+
+$migrator->rollback();

cli-config.php

@@ -10,7 +10,9 @@
  */
 
 use Doctrine\DBAL\DriverManager;
+use Doctrine\ODM\PHPCR\DocumentManagerInterface as PHPCRDocumentManager;
 use Doctrine\ODM\PHPCR\Tools\Console\Helper\DocumentManagerHelper as PhpcrDocumentManagerHelperAlias;
+use Doctrine\ORM\EntityManagerInterface as ORMEntityManager;
 use Doctrine\ORM\Tools\Console\ConsoleRunner as DoctrineORMConsoleRunner;
 use Jackalope\Tools\Console\Command\InitDoctrineDbalCommand as JackalopeInitDbalCommand;
 use Jackalope\Tools\Console\Helper\DoctrineDbalHelper as DoctrinePHPCRHelper;
@@ -37,7 +39,10 @@
 if ($isDoctrineORM) {
     require_once __DIR__.'/tests/Bridge/Doctrine/autoload.php';
 
-    return DoctrineORMConsoleRunner::createHelperSet($GLOBALS['entity_manager']);
+    /** @var ORMEntityManager $entityManager */
+    $entityManager = $GLOBALS['entity_manager_factory']();
+
+    return DoctrineORMConsoleRunner::createHelperSet($entityManager);
 }
 
 if ($isDoctrinePHPCR) {
@@ -66,8 +71,9 @@
 
     require_once __DIR__.'/tests/Bridge/DoctrinePhpCr/autoload.php';
 
-    $session = $GLOBALS['session'];
-    $documentManager = $GLOBALS['document_manager'];
+    /** @var PHPCRDocumentManager $documentManager */
+    $documentManager = $GLOBALS['document_manager_factory']();
+    $session = $documentManager->getPhpcrSession();
 
     $helperSet = new HelperSet([
         'phpcr' => new PhpcrHelper($session),

composer.json

@@ -68,7 +68,10 @@
                 "fixtures",
                 "tests"
             ]
-        }
+        },
+        "files": [
+            "fixtures/get-param.php"
+        ]
     },
 
     "config": {

doctrine-odm-db-settings.php

@@ -2,12 +2,6 @@
 
 declare(strict_types=1);
 
-function get_param(string $envName, $default) {
-    $env = getenv($envName);
-
-    return false !== $env ? $env : $default;
-}
-
 // To keep in sync with docker-compose.yml
 return [
     'username' => get_param('DOCTRINE_ODM_DB_USER', 'root'),

doctrine-orm-db-settings.php

@@ -2,12 +2,6 @@
 
 declare(strict_types=1);
 
-function get_param(string $envName, $default) {
-    $env = getenv($envName);
-
-    return false !== $env ? $env : $default;
-}
-
 // To keep in sync with docker-compose.yml
 return [
     'driver' => get_param('DOCTRINE_ORM_DB_DRIVER', 'pdo_mysql'),

doctrine-phpcr-db-settings.php

@@ -2,12 +2,6 @@
 
 declare(strict_types=1);
 
-function get_param(string $envName, $default) {
-    $env = getenv($envName);
-
-    return false !== $env ? $env : $default;
-}
-
 // To keep in sync with docker-compose.yml
 return [
     'driver' => get_param('DOCTRINE_PHPCR_DB_DRIVER', 'pdo_mysql'),

eloquent-db-settings.php

@@ -2,12 +2,6 @@
 
 declare(strict_types=1);
 
-function get_param(string $envName, $default) {
-    $env = getenv($envName);
-
-    return false !== $env ? $env : $default;
-}
-
 // To keep in sync with docker-compose.yml
 return [
     'driver' => get_param('ELOQUENT_DB_DRIVER', 'mysql'),

fixtures/get-param.php

@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Fidry\AliceDataFixtures package.
+ *
+ * (c) Théo FIDRY <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+function get_param(string $envName, $default)
+{
+    $env = getenv($envName);
+
+    return false !== $env ? $env : $default;
+}

tests/Bridge/Doctrine/Persister/ObjectManagerPersisterTest.php

@@ -13,7 +13,6 @@
 
 namespace Fidry\AliceDataFixtures\Bridge\Doctrine\Persister;
 
-use Doctrine\Common\DataFixtures\Purger\ORMPurger;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\ORMInvalidArgumentException;
 use Fidry\AliceDataFixtures\Bridge\Doctrine\Entity\Dummy;
@@ -37,18 +36,18 @@ class ObjectManagerPersisterTest extends TestCase
 
     private EntityManagerInterface $entityManager;
 
-    private ORMPurger $purger;
-
     public function setUp(): void
     {
-        $this->entityManager = $GLOBALS['entity_manager'];
+        $this->entityManager = $GLOBALS['entity_manager_factory']();
         $this->persister = new ObjectManagerPersister($this->entityManager);
-        $this->purger = new ORMPurger($this->entityManager);
+
+        $this->entityManager->getConnection()->beginTransaction();
     }
 
     public function tearDown(): void
     {
-        $this->purger->purge();
+        $this->entityManager->getConnection()->rollBack();
+        $this->entityManager->clear();
     }
 
     public function testIsAPersister(): void

tests/Bridge/Doctrine/Purger/PurgerTest.php

@@ -15,9 +15,9 @@
 
 use Doctrine\Common\DataFixtures\Purger\ORMPurger as DoctrineOrmPurger;
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\Driver\AbstractMySQLDriver;
 use Doctrine\DBAL\Platforms\MySqlPlatform;
 use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Fidry\AliceDataFixtures\Bridge\Doctrine\Entity\Dummy;
 use Fidry\AliceDataFixtures\Bridge\Doctrine\ORM\FakeEntityManager;
 use Fidry\AliceDataFixtures\Persistence\PurgeMode;
@@ -92,8 +92,8 @@ public function testDisableFKChecksOnDeleteIsPerformed(): void
 
     public function testEmptyDatabase(): void
     {
-        /** @var EntityManager $manager */
-        $manager = $GLOBALS['entity_manager'];
+        /** @var EntityManagerInterface $manager */
+        $manager = $GLOBALS['entity_manager_factory']();
 
         $dummy = new Dummy();
         $manager->persist($dummy);
@@ -111,5 +111,8 @@ public function testEmptyDatabase(): void
         $manager->persist($dummy);
         $manager->flush();
         self::assertCount(1, $manager->getRepository(Dummy::class)->findAll());
+
+        // TODO: move to a tearDown()
+        $manager->clear();
     }
 }

tests/Bridge/Doctrine/autoload.php

@@ -23,9 +23,9 @@
     true,
 );
 
-$entityManager = EntityManager::create(
+$entityManagerFactory = static fn () => EntityManager::create(
     require ROOT.'/doctrine-orm-db-settings.php',
     $config,
 );
 
-$GLOBALS['entity_manager'] = $entityManager;
+$GLOBALS['entity_manager_factory'] = $entityManagerFactory;

tests/Bridge/DoctrineMongoDB/Persister/ObjectManagerPersisterTest.php

@@ -14,6 +14,7 @@
 namespace Fidry\AliceDataFixtures\Bridge\DoctrineMongoDB\Persister;
 
 use Doctrine\Common\DataFixtures\Purger\MongoDBPurger;
+use Doctrine\Common\DataFixtures\Purger\PurgerInterface;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ODM\MongoDB\MongoDBException;
 use Fidry\AliceDataFixtures\Bridge\Doctrine\MongoDocument\Dummy;
@@ -38,18 +39,19 @@ class ObjectManagerPersisterTest extends TestCase
 
     private DocumentManager $documentManager;
 
-    private MongoDBPurger $purger;
+    private PurgerInterface $purger;
 
     public function setUp(): void
     {
-        $this->documentManager = $GLOBALS['document_manager'];
+        $this->documentManager = $GLOBALS['document_manager_factory']();
         $this->persister = new ObjectManagerPersister($this->documentManager);
         $this->purger = new MongoDBPurger($this->documentManager);
     }
 
     public function tearDown(): void
     {
         $this->purger->purge();
+        $this->documentManager->clear();
     }
 
     public function testIsAPersister(): void

tests/Bridge/DoctrineMongoDB/Purger/PurgerTest.php

@@ -15,6 +15,7 @@
 
 use Doctrine\Common\DataFixtures\Purger\MongoDBPurger;
 use Doctrine\ODM\MongoDB\DocumentManager;
+use Doctrine\ODM\PHPCR\DocumentManagerInterface;
 use Fidry\AliceDataFixtures\Bridge\Doctrine\MongoDocument\Dummy;
 use Fidry\AliceDataFixtures\Bridge\Doctrine\Purger\Purger;
 use PHPUnit\Framework\TestCase;
@@ -45,8 +46,8 @@ public function testCreatesADoctrineOdmPurgerWithTheAppropriateManager(): void
 
     public function testEmptyDatabase(): void
     {
-        /** @var DocumentManager $manager */
-        $manager = $GLOBALS['document_manager'];
+        /** @var DocumentManagerInterface $manager */
+        $manager = $GLOBALS['document_manager_factory']();
 
         $dummy = new Dummy();
         $manager->persist($dummy);
@@ -64,5 +65,8 @@ public function testEmptyDatabase(): void
         $manager->persist($dummy);
         $manager->flush();
         self::assertCount(1, $manager->getRepository(Dummy::class)->findAll());
+
+        // TODO: move to a tearDown()
+        $manager->clear();
     }
 }

tests/Bridge/DoctrineMongoDB/autoload.php

@@ -43,7 +43,7 @@
     $port,
 );
 
-$documentManager = DocumentManager::create(
+$documentManagerFactory = static fn () => DocumentManager::create(
     new Client(
         $uri,
         [],
@@ -52,4 +52,4 @@
     $config,
 );
 
-$GLOBALS['document_manager'] = $documentManager;
+$GLOBALS['document_manager_factory'] = $documentManagerFactory;

tests/Bridge/DoctrinePhpCr/Persister/ObjectManagerPersisterTest.php

@@ -15,7 +15,8 @@
 
 use function bin2hex;
 use Doctrine\Common\DataFixtures\Purger\PHPCRPurger;
-use Doctrine\ODM\PHPCR\DocumentManager;
+use Doctrine\Common\DataFixtures\Purger\PurgerInterface;
+use Doctrine\ODM\PHPCR\DocumentManagerInterface;
 use Doctrine\ODM\PHPCR\Exception\InvalidArgumentException;
 use Fidry\AliceDataFixtures\Bridge\Doctrine\Persister\ObjectManagerPersister;
 use Fidry\AliceDataFixtures\Bridge\Doctrine\PhpCrDocument\Dummy;
@@ -33,20 +34,21 @@ class ObjectManagerPersisterTest extends TestCase
 {
     private ObjectManagerPersister $persister;
 
-    private DocumentManager $documentManager;
+    private DocumentManagerInterface $documentManager;
 
-    private PHPCRPurger $purger;
+    private PurgerInterface $purger;
 
     public function setUp(): void
     {
-        $this->documentManager = $GLOBALS['document_manager'];
+        $this->documentManager = $GLOBALS['document_manager_factory']();
         $this->persister = new ObjectManagerPersister($this->documentManager);
         $this->purger = new PHPCRPurger($this->documentManager);
     }
 
     public function tearDown(): void
     {
         $this->purger->purge();
+        $this->documentManager->clear();
     }
 
     public function testIsAPersister(): void

tests/Bridge/DoctrinePhpCr/Purger/PurgerTest.php

@@ -67,7 +67,7 @@ public function testCreatesADoctrineOrmPurgerWithTheAppropriateManagerAndPurgeMo
     public function testEmptyDatabase(): void
     {
         /** @var DocumentManager $manager */
-        $manager = $GLOBALS['document_manager'];
+        $manager = $GLOBALS['document_manager_factory']();
 
         $dummy = new Dummy();
         $dummy->id = '/dummy_'.bin2hex(random_bytes(6));
@@ -87,5 +87,8 @@ public function testEmptyDatabase(): void
         $manager->persist($dummy);
         $manager->flush();
         self::assertCount(1, $manager->getRepository(Dummy::class)->findAll());
+
+        // TODO: move to a tearDown()
+        $manager->clear();
     }
 }